educode_sales 1.10.48 → 1.10.58

data/app/views/educode_sales/sale_trends/_return_money_forecast.html.erb

@@ -1,4 +1,4 @@
-<div id="tab_9">
+<div id="tab_7">
   <div class="" style="padding-right: 50px">
     <div style="margin: 10px 10px 10px 10px">
       <form class="layui-form layui-form-pane" lay-filter="search_form">

data/app/views/educode_sales/sale_trends/_user_stat.html.erb

@@ -1,5 +1,5 @@
 <%= Gon::Base.render_data %>
-  <div id="tab_7" lay-filter="test7">
+  <div id="tab_8" lay-filter="test7">
     <div class="" style="padding-right: 50px">
       <table class="layui-hide" id="table_7_year"></table>
     </div>

data/app/views/educode_sales/sale_trends/_visit_analysis.html.erb

@@ -1,4 +1,4 @@
-<div id="tab_8">
+<div id="tab_9">
   <div class="" style="padding-right: 50px">
     <div style="margin: 10px 10px 10px 10px">
       <form class="layui-form layui-form-pane" lay-filter="search_visit_form">

data/app/views/educode_sales/sale_trends/return_money_forecast.js.erb

@@ -1 +1 @@
-$("#page_9").html("<%= j render 'return_money_forecast' %>");
+$("#page_7").html("<%= j render 'return_money_forecast' %>");

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -6,9 +6,9 @@
     <li class="">商机区域分布</li>
     <li class="">销售人员跟进分析</li>
     <li class="">中标预测图</li>
+    <li class="">回款预测图</li>
     <li class="">用户分析</li>
     <li class="">拜访分析</li>
-    <li class="">回款预测图</li>
   </ul>
   <div class="layui-tab-content">
     <div class="layui-tab-item layui-show">
@@ -141,7 +141,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>已回款<a href="/missions/businesses?name=(销售态势-<%=@year %>-已回款商机)&date_at=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>已回款<a href="/missions/money_plans/list?date_at=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @return_amount %>万</h1>
@@ -192,7 +192,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>应收款<a href="/missions/businesses?name=(销售态势-<%=@year %>-应收款商机)&step=应收款&bidded_date_year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>应收款<a href="/missions/contracts?date_at=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @receivable_amount.round(2) %>万</h1>
@@ -271,11 +271,11 @@
             } else if (data.index == 5 && $("#tab_6").length == 0) {
                 loadPage('/missions/sale_trends/goal_forecast')
             } else if (data.index == 6 && $("#tab_7").length == 0) {
-                loadPage('/missions/sale_trends/user_stat')
+                loadPage('/missions/sale_trends/return_money_forecast')
             } else if (data.index == 7 && $("#tab_8").length == 0) {
-                loadPage('/missions/sale_trends/visit_analysis')
+                loadPage('/missions/sale_trends/user_stat')
             } else if (data.index == 8 && $("#tab_9").length == 0) {
-                loadPage('/missions/sale_trends/return_money_forecast')
+                loadPage('/missions/sale_trends/visit_analysis')
             }
         });
 

data/app/views/educode_sales/sale_trends/user_stat.js.erb

@@ -1 +1 @@
-$("#page_7").html("<%= j render 'user_stat' %>");
+$("#page_8").html("<%= j render 'user_stat' %>");

data/app/views/educode_sales/sale_trends/visit_analysis.js.erb

@@ -1 +1 @@
-$("#page_8").html("<%= j render 'visit_analysis' %>");
+$("#page_9").html("<%= j render 'visit_analysis' %>");

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

@@ -0,0 +1,516 @@
+<!-- 图标  -->
+<style>
+    .markdown_list img {
+        max-width: 700px;
+    }
+
+    .layui-table-cell {
+        height: auto !important;
+        width: auto;
+        white-space: normal;
+        /*line-height: 28px;*/
+    }
+</style>
+<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1531710_xb357ub1wmg.css"/>
+<style>
+    .inner_div {
+        margin-bottom: 10px;
+        margin-right: 10px;
+    }
+</style>
+<div class="layui-tab" style="margin: 10px">
+  <ul class="layui-tab-title">
+    <li id="index_1" class="layui-this" lay-id="11">待审核</li>
+    <li id="index_2" lay-id="22">已审核</li>
+
+  </ul>
+  <div class="layui-tab-content">
+    <div>
+      <form class="layui-form layui-form-pane" lay-filter="search_form">
+        <div class="layui-inline show_item_contract inner_div">
+          <label class="layui-form-label">任务类型</label>
+          <div class="layui-input-inline">
+            <%= select_tag "category", options_for_select(
+              [["全部", 0], ["管培", 1], ["全职", 2], ["专职", 3]], selected: 0
+            ), { include_blank: true } %>
+          </div>
+        </div>
+        <div id="shixun_dectect_type_form" style="display: none" class="layui-inline show_item_contract inner_div">
+          <label class="layui-form-label">审核状态</label>
+          <div class="layui-input-inline">
+            <%= select_tag "dectect_type", options_for_select(
+              [["全部", 0], ["已通过", 1], ["已驳回", 2]], selected: 0
+            ), { include_blank: true } %>
+          </div>
+        </div>
+        <div class="layui-inline borders inner_div">
+          <label class="layui-form-label" style="width: 130px">实践项目名称</label>
+          <div class="layui-input-inline">
+            <input type="text" class="layui-input" name="shixun_name">
+          </div>
+        </div>
+        <div class="layui-inline borders inner_div">
+          <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+          </button>
+          <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_contract">搜索
+          </button>
+        </div>
+      </form>
+    </div>
+
+    <div id="contact_table_wraper">
+      <table class="layui-hide" id="shixun_dectects_table" lay-filter="shixun_dectects_table"></table>
+    </div>
+
+
+  </div>
+</div>
+
+<script type="text/html" id="shixun_table_bar">
+  <a class="layui-btn layui-btn-xs data-count-edit" lay-event="pass">通过</a>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit layui-bg-red" lay-event="reject">驳回</a>
+  {{# if(d.audit_history.length > 0){ }}
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit layui-bg-blue" lay-event="info">详情</a>
+  {{# } }}
+</script>
+
+<script type="text/html" id="shixun_dectect_type">
+  {{# if(d.dectect_type === 1){ }}
+  <span style="color: green">已通过</span>
+  {{# } else if(d.dectect_type === 2){ }}
+  <span style="color: red">已驳回</span>
+
+  {{# } }}
+</script>
+<script type="text/html" id="category_list">
+  {{# if(d.category === 1){ }}
+  <span>管培</span>
+  {{# } else if(d.category === 2){ }}
+  <span>全职</span>
+  {{# } else if(d.category === 3){ }}
+  <span>专职</span>
+  {{# } }}
+</script>
+
+<script type="text/html" id="show_level">
+  {{# if(d.level === 1){ }}
+  <span>不明确</span>
+  {{# } else if(d.level === 2){ }}
+  <span>重要紧急</span>
+  {{# } else if(d.level === 3){ }}
+  <span>重要不紧急</span>
+  {{# } else if(d.level === 4){ }}
+  <span>不重要紧急</span>
+  {{# } else if(d.level === 5){ }}
+  <span>不重要不紧急</span>
+  {{# } }}
+</script>
+<script type="text/html" id="aherf">
+  {{# if(d.identifier !== null && d.identifier !== ''){ }}
+  <a target="_blank" style="color:deepskyblue" href="<%= @url %>/shixuns/{{= d.identifier}}/challenges">{{=d.shixun_name}}</a>
+  {{# } else { }}
+  <a style="color:deepskyblue">{{=d.shixun_name}}</a>
+  {{# } }}
+</script>
+<script type="text/html" id="show_state">
+  {{# if(d.shixun_status === 1){ }}
+  <span>待建设</span>
+  {{# } else if(d.shixun_status === 2){ }}
+  <span>已签协议</span>
+  {{# } else if(d.shixun_status === 3){ }}
+  <span>建设中</span>
+  {{# } else if(d.shixun_status === 4){ }}
+  <span>审核中</span>
+  {{# } else if(d.shixun_status === 5){ }}
+  <span>返修中</span>
+  {{# } else if(d.shixun_status === 6){ }}
+  <span>已内部发布</span>
+  {{# } else if(d.shixun_status === 7){ }}
+  <span>已公开发布</span>
+  {{# } }}
+</script>
+<script src="/markdown/marked.min.js" type="text/javascript" charset="utf-8"></script>
+<script>
+    function extractFirstTenCharsAndImage(markdownText) {
+        let firstTenChars = '';
+        let imageTag = '';
+        // 行内图片的正则表达式
+        const inlineImageRegex = /!\[.*?\]\((.*?)\)/g;
+        // 处理行内图片
+        markdownText = markdownText.replace(inlineImageRegex, (_, imagePath) => {
+            // 如果匹配到行内图片，则生成图片标签，并将匹配的图片部分替换为空字符串
+            imageTag = `<img style="max-height: 100px" src="${imagePath}" />`;
+            return '';
+        });
+        // 去除Markdown格式，只保留纯文本内容
+        const pureText = markdownText.replace(/(^|\n)(\d+\.|)\s*/g, '$1').trim();
+        // 获取前十个字符
+        firstTenChars = pureText.substring(0, 10);
+        // 输出结果
+        return `<div lay-event="show_markdown"><p>${firstTenChars}</p> ${imageTag}</div>`
+    }
+
+
+    layui.config({
+        base: '/markdown/mods/' //存放layui拓展模块的目录位置
+    }).use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown', 'easyeditor'], function () {
+        var laydate = layui.laydate,
+            form = layui.form,
+            table = layui.table,
+            miniPage = layui.miniPage,
+            easyeditor = layui.easyeditor
+        easyeditor.render({
+            elem: ".easyeditor-content"
+        });
+        var cols_table = [
+            [
+                {
+                    field: 'id',
+                    minWidth: 60,
+                    title: '序号',
+                    type: 'numbers',
+                    align: 'center'
+                },
+                {
+                    field: 'category',
+                    title: '标签',
+                    align: 'center',
+                    templet: '#category_list',
+                },
+                {
+                    field: 'school_name',
+                    title: '交付单位',
+                    align: 'center',
+                    minWidth: 100
+
+                },
+                {
+                    title: '实践项目名称',
+                    minWidth: 200,
+                    align: 'center',
+                    templet: "#aherf"
+                },
+                {
+                    field: 'shixun_producer',
+                    title: '实训制作人',
+                    minWidth: 200,
+                    align: 'center'
+                },
+                {
+                    field: 'shixun_manages',
+                    title: '课程组长',
+                    minWidth: 200,
+                    align: 'center'
+                },
+                {
+                    field: 'level',
+                    title: '项目级别',
+                    width: 150,
+                    align: 'center',
+                    templet: '#show_level'
+                },
+                {
+                    field: 'deliver_date',
+                    title: '交付时间',
+                    width: 180,
+                    align: 'center'
+                },
+                {
+                    field: 'deliver_money',
+                    title: '金额',
+                    minWidth: 100,
+                    align: 'center'
+                },
+                {
+                    field: 'shixun_status',
+                    title: '项目状态',
+                    align: 'center',
+                    minWidth: 100,
+                    templet: '#show_state'
+                },
+                {
+                    title: '操作',
+                    width: 200,
+                    toolbar: '#shixun_table_bar',
+                    align: "center",
+                }
+            ]
+        ]
+        var data = form.val("search_form");
+        //默认显示待审核的
+        data.index = 1
+        table.render({
+            elem: '#shixun_dectects_table',
+            where: {q: data},
+            url: '/missions/shixun_dectects',
+            cellMinWidth: 80,
+            cols: cols_table,
+            limit: 10,
+            limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
+            page: true
+        })
+        var sort = {}, search = {};
+        // 监听搜索操作
+        form.on('submit(search_contract)', function (data) {
+            search = data.field
+            var index = localStorage.getItem("index")
+            search.index = index
+            table.reload('shixun_dectects_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            return false;
+        });
+        // 重置
+        form.on('submit(reset_business_search)', function (data) {
+            var index = localStorage.getItem("index")
+            table.reload('shixun_dectects_table', {
+                page: {
+                    curr: 1
+                },
+                where: {
+                    q: {
+                        index: index
+                    }
+                }
+            }, 'data');
+            $(".layui-form")[0].reset();
+            form.render()
+            return false;
+        });
+
+        table.on('tool(shixun_dectects_table)', function (obj) {
+            var data = obj.data;
+            // 编辑按钮监听
+            if (obj.event === 'pass') {
+                data.type = 1
+                $.ajax('/missions/shixun_dectects/examine', {
+                    method: 'PUT',
+                    data: data,
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.success) {
+                            table.reload('shixun_dectects_table', {
+                                page: {
+                                    curr: 1
+                                },
+                                cols: cols_table,
+                                where: {q: data}
+                            })
+                        }
+                    }
+                })
+                return false;
+            } else if (obj.event === 'reject') {
+                data.type = 2
+
+                localStorage.setItem("reject_id", data.id)
+                var content = miniPage.getHrefContent('/missions/shixun_dectects/markdown');
+                var openWH = miniPage.getOpenWidthHeight();
+
+                var edit = layer.open({
+                    title: '拒绝原因',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: false,
+                    area: ['900px', '550px'],
+                    // offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                });
+                return false;
+            } else if (obj.event === 'info') {
+                var text = `<div class="layui-timeline" style="margin: 40px">`
+                data.audit_history.forEach((item) => {
+                    text += `<div class="layui-timeline-item">
+                                <i class="layui-icon layui-timeline-axis"></i>
+                                <div class="layui-timeline-content layui-text">
+                                  <h3 class="layui-timeline-title">` + new Date(item.created_at).toLocaleString('zh-CN') +
+                        `-----` + item.examine_name + `</h3>
+                                  <p>
+                                    审核状态：驳回
+                                  </p>
+                                  <p>
+                                    拒绝原因：
+                                    <div class="markdown_list" >` + item.content + `</div>
+                                  </p>
+                                </div>
+                              </div>`
+                })
+                text += `</div>`
+
+                layer.open({
+                    type: 1,
+                    title: '审核记录',
+                    area: ['900px', '500px'], // 宽高
+                    content: text,
+                    move: '#ID-test-layer-move'
+                });
+                easyeditor.render({
+                    elem: ".markdown_list"
+                });
+                return false
+            } else if (obj.event === 'show_markdown') {
+                if (data.content !== '--') {
+                    var text = `<div class="markdown_list" style="margin: 50px" >` + data.content + `</div>`
+                    layer.open({
+                        type: 1,
+                        title: '审核反馈',
+                        area: ['900px', '700px'], // 宽高
+                        content: text,
+                        move: '#ID-test-layer-move'
+                    });
+                    easyeditor.render({
+                        elem: ".markdown_list"
+                    });
+                }
+            }
+
+        });
+
+        form.on('submit(shixun_dectects_table)', function (data) {
+            search = data.field
+            table.reload('table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            return false;
+        });
+        $("#shixun_dectect_type_form").hide()
+        //控制顶部的待审核 和已审核
+        for (let i = 1; i <= 2; i++) {
+
+            if (i !== 2) {
+                $("#index_" + i).click(function () {
+                    $(".layui-form")[0].reset();
+                    $("#shixun_dectect_type_form").hide()
+                    data.index = i
+                    localStorage.setItem("index", i)
+                    table.reload('shixun_dectects_table', {
+                        page: {
+                            curr: 1
+                        },
+                        cols: cols_table,
+                        where: {q: data}
+                    })
+                });
+            } else {
+                $("#index_" + i).click(function () {
+                    $(".layui-form")[0].reset();
+                    $("#shixun_dectect_type_form").show()
+                    localStorage.setItem("index", i)
+                    var arr = [
+                        [
+                            {
+                                field: 'id',
+                                minWidth: 60,
+                                title: '序号',
+                                type: 'numbers',
+                                align: 'center'
+                            },
+                            {
+                                field: 'category',
+                                title: '标签',
+                                align: 'center',
+                                templet: '#category_list',
+                            },
+                            {
+                                field: 'school_name',
+                                title: '交付单位',
+                                align: 'center',
+                                minWidth: 100
+
+                            },
+                            {
+                                title: '实践项目名称',
+                                minWidth: 200,
+                                align: 'center',
+                                templet: "#aherf"
+                            },
+                            {
+                                field: 'shixun_manages',
+                                title: '课程负责人',
+                                minWidth: 200,
+                                align: 'center'
+                            },
+                            {
+                                field: 'shixun_producer',
+                                title: '实训制作人',
+                                minWidth: 200,
+                                align: 'center'
+                            },
+                            {
+                                field: 'level',
+                                title: '项目级别',
+                                width: 150,
+                                align: 'center',
+                                templet: '#show_level'
+                            },
+                            {
+                                field: 'deliver_date',
+                                title: '交付时间',
+                                width: 180,
+                                align: 'center'
+                            },
+                            {
+                                field: 'deliver_money',
+                                title: '金额',
+                                minWidth: 100,
+                                align: 'center'
+                            },
+                            {
+                                field: 'real_name',
+                                title: '审核人',
+                                align: 'center',
+                                minWidth: 100,
+                            },
+                            {
+                                title: '审核反馈',
+                                templet: (d) => {
+                                    if (d.dectect_type === 2) {
+                                        return extractFirstTenCharsAndImage(d.content)
+                                    }
+                                    return ''
+                                },
+                                align: 'center',
+                                minWidth: 100,
+                            },
+                            {
+                                title: '状态',
+                                width: 200,
+                                toolbar: '#shixun_dectect_type',
+                                align: "center",
+                            }
+                        ]
+                    ]
+
+
+                    data.index = i
+                    table.reload('shixun_dectects_table', {
+                        page: {
+                            curr: 1
+                        },
+                        cols: arr,
+                        where: {q: data},
+                        success: (res) => {
+                            easyeditor.render({
+                                elem: ".markdown_list"
+                            });
+                        }
+                    })
+
+                });
+            }
+
+        }
+
+
+    });
+</script>

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

@@ -0,0 +1,23 @@
+json.data do
+  json.array! @shixun_dectects do |d|
+    json.audit_history d.audit_history
+    json.content d.content
+    json.shixun_manages d.shixun_manages
+    json.shixun_producer d.shixun_producer
+    json.shixun_staff d.shixun_staff
+    json.type d.shixun_type
+    json.deliver_date handled_time_data @times["#{d.id}"]
+    json.deliver_money handled_data d.deliver_money
+    json.category d.category
+    json.school_name handled_data d.shixun_school
+    json.shixun_name d.shixun_name
+    json.shixun_status d.shixun_status
+    json.real_name d.real_name
+    json.dectect_type d.dectect_type
+    json.level d.level
+    json.identifier d.identifier
+    json.id d.id
+  end
+end
+json.code 0
+json.count @shixun_dectects.total_count

data/app/views/educode_sales/shixun_dectects/markdown.html.erb

@@ -0,0 +1,60 @@
+<div style="margin: 20px;margin-bottom: 50px">
+  <p style="font-size: 30px;margin-bottom: 10px">原因：</p>
+  <div>
+    <form class="layui-form layui-form-pane" lay-filter="search_form">
+      <textarea id="L_content" name="content" style="" required lay-verify="required" class="layui-textarea editor"></textarea>
+    </form>
+  </div>
+
+  <div style="margin: 20px;float: right">
+    <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认</button>
+    <button class="layui-btn layui-btn-normal" lay-submit lay-filter="exit">取消</button>
+  </div>
+</div>
+<script src="/markdown/marked.min.js" type="text/javascript" charset="utf-8"></script>
+<script>
+    layui.config({
+        base: '/markdown/mods/' //存放layui拓展模块的目录位置
+    }).use(['easyeditor','form','table'], function () {
+        var table = layui.table
+        var easyeditor = layui.easyeditor;
+        var form = layui.form
+        //初始化Markdown编辑器
+        easyeditor.init({
+            elem: '.editor' //textarea 元素class
+            , uploadUrl: '/api/attachments/' //图片上传地址
+            , uploadSize: '1024 * 10' //限制的上传大小 单位kb 默认 1024k
+
+        });
+        form.on('submit(saveBtn)', function (data) {
+            console.log(form.val())
+            var id = localStorage.getItem("reject_id")
+
+            let new_data = form.val();
+            new_data.type = 2
+            new_data.id = id
+            $.ajax('/missions/shixun_dectects/examine', {
+                method: 'PUT',
+                data: new_data,
+                dataType: 'json',
+                success: function (res) {
+                    if (res.success) {
+                        layer.closeAll();
+                        table.reload('shixun_dectects_table', {
+                            done: function () {
+                            }
+                        });
+                    }
+                },
+                error: function (res) {
+                    layer.msg('更新失败');
+                }
+            })
+        });
+
+        form.on('submit(exit)', function (data) {
+            layer.closeAll()
+        });
+
+    });
+</script>