educode_sales 1.10.48 → 1.10.49

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

@@ -0,0 +1,254 @@
+<%= Gon::Base.render_data %>
+<form class="layui-form" action="" style="width: 90%;margin-top: 20px">
+
+  <div class="layui-form-item">
+    <label class="layui-form-label" style="width: 100px">实践课程名称:<span style="color: red"> *</span></label>
+    <div class="layui-input-block">
+      <div id="subject_id" style="width: 50%;margin-left: 10px"></div>
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label" style="width: 100px">实践项目名称:<span style="color: red"> *</span></label>
+    <div class="layui-input-block">
+      <div id="shixun_ids" style="width: 50%;margin-left: 10px"></div>
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">交付时间:<span style="color: red"> *</span></label>
+    <div class="layui-input-block">
+      <input type="text" name="deliver_date" style="width: 50%;" class="layui-input" id="ID-laydate-demo" placeholder="- -">
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">课程经理:<span style="color: red"> *</span></label>
+    <div class="layui-input-block">
+      <div id="manage_id" style="width: 50%"></div>
+    </div>
+  </div>
+
+  <div class="layui-form-item">
+    <label class="layui-form-label" style="width: 80px">交付单位:<span style="color: red"> *</span></label>
+    <div class="layui-input-block">
+      <div id="school_id" style="width: 50%;"></div>
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">销售:<span style="color: red"> *</span></label>
+    <div class="layui-input-block">
+      <div id="sale_id" style="width: 50%"></div>
+    </div>
+  </div>
+
+
+
+
+
+
+  <div class="layui-form-item">
+    <label class="layui-form-label"></label>
+    <div class="layui-input-block">
+      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+    </div>
+  </div>
+</form>
+<script>
+    layui.use(['form', 'request', 'xmSelect', 'table'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            laydate = layui.laydate,
+            table = layui.table,
+            xmSelect = layui.xmSelect,
+            $ = layui.$;
+
+        // 解决form表单中select不渲染的问题
+        form.render();
+        form.render('select', 'test')
+        laydate.render({
+            elem: '#ID-laydate-demo'
+        });
+
+        // 交付单位
+        var school_id = xmSelect.render({
+            el: '#school_id',
+            name: "school_id",
+            remoteSearch: true,
+            autoRow: true,
+            delay: 1000,
+            tips: '- -',
+            radio: true,
+            searchTips: '支持名称搜索,请至少输入一个字符',
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if (!val) {
+                    return cb([]);
+                }
+                $.ajax('/api/schools/search', {
+                    method: 'get',
+                    data: {
+                        keyword: val
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        console.log(res)
+                        var data = res.schools;
+                        data.forEach((item)=>{
+                            item.value = item.id
+                        })
+                        if (res.status === 0) {
+                            cb(data);
+                        }
+                    }
+                })
+            }
+        })
+
+
+        var shixun_ids = xmSelect.render({
+            el: '#shixun_ids',
+            name: "shixun_ids",
+            autoRow: true,
+            delay: 1000,
+            tips: '- -',
+            searchTips: '支持名称搜索,请至少输入一个字符',
+            filterable: true
+        })
+
+
+        // 实践课程
+        var subject_id = xmSelect.render({
+            el: '#subject_id',
+            name: "subject_id",
+            remoteSearch: true,
+            autoRow: true,
+            delay: 1000,
+            tips: '- -',
+            radio: true,
+            searchTips: '支持名称搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            on: function (data) {
+                if(data.arr.length){
+                    let subject_id = data.arr[0].value
+                    $.ajax('/missions/subjects/shixun_list', {
+                        method: 'get',
+                        data: {
+                            subject_id: subject_id
+                        },
+                        dataType: 'json',
+                        success: function (res) {
+                            var data = res.data;
+                            if (res.code == 0) {
+                                shixun_ids.update({
+                                    data: data
+                                })
+                            }
+                        }
+                    })
+                }
+            },
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if (!val) {
+                    return cb([]);
+                }
+                $.ajax('/missions/subjects/search_subjects', {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        console.log(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 manage_id = xmSelect.render({
+            el: '#manage_id',
+            name: "manage_id",
+            data: gon.staffs,
+            filterable: true,
+            tips: "- -",
+            tips: "- -",
+            paging: true,
+            multiple: true
+        })
+        // 销售
+        var sale_id = xmSelect.render({
+            el: '#sale_id',
+            name: "sale_id",
+            data: gon.staffs,
+            filterable: true,
+            tips: "- -",
+            tips: "- -",
+            paging: true,
+            multiple: true
+        })
+
+        function isNull(str){
+            return str === "" || str === null
+        }
+        form.on('submit(saveBtn)', function (data) {
+            console.log(form.val())
+            let new_data = form.val();
+
+            if(isNull(new_data.subject_id)){
+                layer.msg('实践课程未选择');
+                return false
+            }
+            if(isNull(new_data.shixun_ids)){
+                layer.msg('实践项目未选择');
+                return false
+            }
+            if(isNull(new_data.deliver_date)){
+                layer.msg('交付时间未选择');
+                return false
+            }
+            if(isNull(new_data.manage_id)){
+                layer.msg('课程经理未选择');
+                return false
+            }
+            if(isNull(new_data.school_id)){
+                layer.msg('交付单位未选择');
+                return false
+            }
+            if(isNull(new_data.sale_id)){
+                layer.msg('销售经理未选择');
+                return false
+            }
+
+
+            $.ajax('/missions/subjects/', {
+                method: 'POST',
+                data: new_data,
+                dataType: 'json',
+                success: function (res) {
+                    console.log(res)
+                    if (res.success) {
+                        layer.closeAll();
+                        table.reload('table', {
+                            done: function () {
+                            }
+                        });
+                    } else {
+                        layer.msg('实践课程已存在');
+                    }
+                },
+                error:function (res) {
+                    layer.msg('实践课程已存在');
+                }
+            })
+            return false;
+        });
+    });
+</script>

data/app/views/layouts/educode_sales/application.html.erb

@@ -221,6 +221,44 @@
               </dl>
             </li>
             <% end %>
+            <% if can?(:checkout, EducodeSales::BusinessDeliverSubject) ||
+              can?(:shixun, EducodeSales::BusinessDeliverSubject) ||
+              can?(:subject, EducodeSales::BusinessDeliverSubject) ||
+              can?(:business, EducodeSales::BusinessDeliverSubject) ||
+              can?(:status, EducodeSales::BusinessDeliverSubject) ||
+              @current_admin.is_admin %>
+            <li class="layui-nav-item layui-nav-itemed menu-li">
+                <a class href="javascript:;"><b><%= image_tag "educode_sales/5.渠道管理.png", size: "15" %>
+                  <i style="font-size: 25px;  padding-right: 25px"></i>课程管理</b></a>
+                <dl class="layui-nav-child">
+                  <% if can?(:status, EducodeSales::BusinessDeliverSubject) %>
+                  <dd>
+                      <a href="/missions/subject_trends/trends" class=""><i style="padding-right: 35px"></i><%= image_tag "educode_sales/7.运营活动.png", size: "15" %>
+                      <i style="font-size: 25px;  padding-right: 15px"></i>课程态势</a></dd>
+                    <%end %>
+                  <% if can?(:business, EducodeSales::BusinessDeliverSubject) %>
+                  <dd>
+                    <a href="/missions/business_courses" class="<%= current?('layui-this', business_courses_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png", size: "15" %>
+                      <i style="font-size: 25px;  padding-right: 15px"></i>商机交付课程</a></dd>
+                    <%end %>
+                  <% if can?(:subject, EducodeSales::BusinessDeliverSubject) %>
+                  <dd>
+                    <a href="/missions/subjects" class="<%= current?('layui-this', subjects_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png", size: "15" %>
+                      <i style="font-size: 25px;  padding-right: 15px"></i>实践课程管理</a></dd>
+                  <%end %>
+                  <% if can?(:shixun, EducodeSales::BusinessDeliverSubject) %>
+                    <dd>
+                    <a href="/missions/shixuns" class="<%= current?('layui-this', shixuns_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png", size: "15" %>
+                      <i style="font-size: 25px;  padding-right: 15px"></i>实践项目管理</a></dd>
+                  <%end %>
+                  <% if can?(:checkout, EducodeSales::BusinessDeliverSubject) %>
+                  <dd>
+                    <a href="/missions/shixun_dectects" class="<%= current?('layui-this', shixun_dectects_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png", size: "15" %>
+                      <i style="font-size: 25px;  padding-right: 15px"></i>课程项目质检</a></dd>
+                  <%end %>
+                </dl>
+            </li>
+            <%end %>
 
             <% if @current_admin.is_admin || @current_admin.code == 'userbe' %>
             <li class="layui-nav-item layui-nav-itemed menu-li">

data/config/routes.rb

@@ -471,4 +471,41 @@ EducodeSales::Engine.routes.draw do
   resources :teacher_follows
   resources :idea_follows
 
+  resources :business_courses do
+    collection do
+      get :list_shixuns
+      get :list_subjects
+      get :subjects
+      get :select_business
+    end
+    member do
+    end
+  end
+
+  resources :subjects do
+    collection do
+      get :shixun_list
+      get :list_shixuns
+      get :search_subjects
+    end
+  end
+
+  resources :subject_trends do
+    collection do
+      get :trends
+    end
+  end
+
+  resources :shixuns
+
+  resources :shixun_dectects do
+    collection do
+      put :examine
+      get :markdown
+      post :submit
+    end
+  end
+
+
+
 end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.48'
+  VERSION = '1.10.49'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.48
+  version: 1.10.49
 platform: ruby
 authors:
 - anke1460
@@ -133,6 +133,8 @@ files:
 - app/assets/stylesheets/educode_sales/layuimini.css
 - app/assets/stylesheets/educode_sales/login.scss
 - app/assets/stylesheets/educode_sales/modules/code.css
+- app/assets/stylesheets/educode_sales/modules/easyeditor/easyeditor.css
+- app/assets/stylesheets/educode_sales/modules/easyeditor/fangge-style.css
 - app/assets/stylesheets/educode_sales/modules/laydate/default/font.scss
 - app/assets/stylesheets/educode_sales/modules/laydate/default/laydate.css
 - app/assets/stylesheets/educode_sales/modules/layer/default/icon-ext.png
@@ -146,6 +148,7 @@ files:
 - app/controllers/educode_sales/activities_controller.rb
 - app/controllers/educode_sales/application_controller.rb
 - app/controllers/educode_sales/assessments_controller.rb
+- app/controllers/educode_sales/business_courses_controller.rb
 - app/controllers/educode_sales/businesses_controller.rb
 - app/controllers/educode_sales/commons_controller.rb
 - app/controllers/educode_sales/contracts_controller.rb
@@ -178,7 +181,11 @@ files:
 - app/controllers/educode_sales/sales_controller.rb
 - app/controllers/educode_sales/sales_details_controller.rb
 - app/controllers/educode_sales/sessions_controller.rb
+- app/controllers/educode_sales/shixun_dectects_controller.rb
+- app/controllers/educode_sales/shixuns_controller.rb
 - app/controllers/educode_sales/staffs_controller.rb
+- app/controllers/educode_sales/subject_trends_controller.rb
+- app/controllers/educode_sales/subjects_controller.rb
 - app/controllers/educode_sales/teacher_follows_controller.rb
 - app/controllers/educode_sales/teachers_controller.rb
 - app/controllers/educode_sales/upload_files_controller.rb
@@ -186,12 +193,14 @@ files:
 - app/helpers/educode_sales/activities_helper.rb
 - app/helpers/educode_sales/application_helper.rb
 - app/helpers/educode_sales/assessments_help.rb
+- app/helpers/educode_sales/business_courses_helper.rb
 - app/helpers/educode_sales/business_helper.rb
 - app/helpers/educode_sales/follow_up_helper.rb
 - app/helpers/educode_sales/home_helper.rb
 - app/helpers/educode_sales/sale_trends_count_helper.rb
 - app/helpers/educode_sales/sale_trends_helper.rb
 - app/helpers/educode_sales/sessions_helper.rb
+- app/helpers/educode_sales/subject_helper.rb
 - app/helpers/educode_sales/teachers_helper.rb
 - app/jobs/educode_sales/application_job.rb
 - app/mailers/educode_sales/application_mailer.rb
@@ -208,12 +217,16 @@ files:
 - app/models/educode_sales/attendance.rb
 - app/models/educode_sales/business.rb
 - app/models/educode_sales/business_clazz_change.rb
+- app/models/educode_sales/business_deliver_subject.rb
 - app/models/educode_sales/business_export_record.rb
 - app/models/educode_sales/business_history.rb
 - app/models/educode_sales/business_info.rb
 - app/models/educode_sales/business_level.rb
 - app/models/educode_sales/business_number_record.rb
 - app/models/educode_sales/business_relation_ship.rb
+- app/models/educode_sales/business_subject.rb
+- app/models/educode_sales/business_subject_shixun.rb
+- app/models/educode_sales/business_subject_staff.rb
 - app/models/educode_sales/business_watch.rb
 - app/models/educode_sales/common.rb
 - app/models/educode_sales/contract_date_list.rb
@@ -256,6 +269,7 @@ files:
 - app/models/educode_sales/sale_report.rb
 - app/models/educode_sales/sale_trend.rb
 - app/models/educode_sales/sales_detail.rb
+- app/models/educode_sales/shixun_dectect.rb
 - app/models/educode_sales/staff.rb
 - app/models/educode_sales/staff_permission.rb
 - app/models/educode_sales/staff_school.rb
@@ -296,6 +310,14 @@ files:
 - app/views/educode_sales/assessments/index.json.jbuilder
 - app/views/educode_sales/assessments/new.html.erb
 - app/views/educode_sales/assessments/progress.json.jbuilder
+- app/views/educode_sales/business_courses/edit.html.erb
+- app/views/educode_sales/business_courses/index.html.erb
+- app/views/educode_sales/business_courses/index.json.jbuilder
+- app/views/educode_sales/business_courses/list_shixuns.html.erb
+- app/views/educode_sales/business_courses/list_shixuns.json.jbuilder
+- app/views/educode_sales/business_courses/list_subjects.html.erb
+- app/views/educode_sales/business_courses/list_subjects.json.jbuilder
+- app/views/educode_sales/business_courses/new.html.erb
 - app/views/educode_sales/businesses/_contract.html.erb
 - app/views/educode_sales/businesses/_contract_list.html.erb
 - app/views/educode_sales/businesses/_follows.html.erb
@@ -609,6 +631,13 @@ files:
 - app/views/educode_sales/sales_details/index.js.erb
 - app/views/educode_sales/sales_details/index.json.jbuilder
 - app/views/educode_sales/sessions/login.html.erb
+- app/views/educode_sales/shixun_dectects/index.html.erb
+- app/views/educode_sales/shixun_dectects/index.json.jbuilder
+- app/views/educode_sales/shixun_dectects/markdown.html.erb
+- app/views/educode_sales/shixuns/edit.html.erb
+- app/views/educode_sales/shixuns/index.html.erb
+- app/views/educode_sales/shixuns/index.json.jbuilder
+- app/views/educode_sales/shixuns/new.html.erb
 - app/views/educode_sales/staffs/edit.html.erb
 - app/views/educode_sales/staffs/follow_up_departments.json.jbuilder
 - app/views/educode_sales/staffs/follow_up_schools.json.jbuilder
@@ -616,6 +645,13 @@ files:
 - app/views/educode_sales/staffs/index.json.jbuilder
 - app/views/educode_sales/staffs/list.html.erb
 - app/views/educode_sales/staffs/new.html.erb
+- app/views/educode_sales/subject_trends/trends.html.erb
+- app/views/educode_sales/subjects/edit.html.erb
+- app/views/educode_sales/subjects/index.html.erb
+- app/views/educode_sales/subjects/index.json.jbuilder
+- app/views/educode_sales/subjects/list_shixuns.html.erb
+- app/views/educode_sales/subjects/list_shixuns.json.jbuilder
+- app/views/educode_sales/subjects/new.html.erb
 - app/views/educode_sales/teacher_follows/index.json.jbuilder
 - app/views/educode_sales/teachers/_follows.html.erb
 - app/views/educode_sales/teachers/_index.html.erb