educode_sales 1.10.49 → 1.10.58

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

@@ -1,8 +1,15 @@
 <!-- 图标  -->
 <style>
-    .markdown_list img{
+    .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>
@@ -21,15 +28,23 @@
     <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>
+          <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: 120px">实践项目名称</label>
+          <label class="layui-form-label" style="width: 130px">实践项目名称</label>
           <div class="layui-input-inline">
             <input type="text" class="layui-input" name="shixun_name">
           </div>
@@ -58,9 +73,7 @@
   <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" class="markdown">
-  <a lay-event="examine">点击查看</a>
-</script>
+
 <script type="text/html" id="shixun_dectect_type">
   {{# if(d.dectect_type === 1){ }}
   <span style="color: green">已通过</span>
@@ -92,6 +105,13 @@
   <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>
@@ -111,6 +131,26 @@
 </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 () {
@@ -129,7 +169,6 @@
                     minWidth: 60,
                     title: '序号',
                     type: 'numbers',
-                    fixed: 'left',
                     align: 'center'
                 },
                 {
@@ -146,10 +185,10 @@
 
                 },
                 {
-                    field: 'shixun_name',
                     title: '实践项目名称',
                     minWidth: 200,
-                    align: 'center'
+                    align: 'center',
+                    templet: "#aherf"
                 },
                 {
                     field: 'shixun_producer',
@@ -174,7 +213,6 @@
                     field: 'deliver_date',
                     title: '交付时间',
                     width: 180,
-                    templet: `<span>{{=new Date(d.deliver_date).toLocaleString('zh-CN')}}</span>`,
                     align: 'center'
                 },
                 {
@@ -195,7 +233,6 @@
                     width: 200,
                     toolbar: '#shixun_table_bar',
                     align: "center",
-                    fixed: 'right'
                 }
             ]
         ]
@@ -216,7 +253,8 @@
         // 监听搜索操作
         form.on('submit(search_contract)', function (data) {
             search = data.field
-            console.log(search)
+            var index = localStorage.getItem("index")
+            search.index = index
             table.reload('shixun_dectects_table', {
                 page: {
                     curr: 1
@@ -225,7 +263,23 @@
             }, '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;
@@ -262,7 +316,7 @@
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
-                    shadeClose: true,
+                    shadeClose: false,
                     area: ['900px', '550px'],
                     // offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content
@@ -301,38 +355,26 @@
                     elem: ".markdown_list"
                 });
                 return false
-            } else if (obj.event === "examine") {
-                var text = `<div class="layui-timeline" style="margin: 40px"><div class="layui-timeline-item">
-                                <i class="layui-icon layui-timeline-axis"></i>
-                                <div class="layui-timeline-content layui-text">
-
-                                  <p>
-                                    审核状态：驳回
-                                  </p>
-                                  <p>
-                                    拒绝原因：
-                                    <div class="markdown_list" >` + data.content + `</div>
-                                  </p>
-                                </div>
-                              </div></div>`
-
-                layer.open({
-                    type: 1,
-                    title: '审核反馈',
-                    area: ['900px', '500px'], // 宽高
-                    content: text,
-                    move: '#ID-test-layer-move'
-                });
-                easyeditor.render({
-                    elem: ".markdown_list"
-                });
+            } 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
-            console.log(search)
             table.reload('table', {
                 page: {
                     curr: 1
@@ -341,13 +383,16 @@
             }, '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
@@ -358,6 +403,9 @@
                 });
             } else {
                 $("#index_" + i).click(function () {
+                    $(".layui-form")[0].reset();
+                    $("#shixun_dectect_type_form").show()
+                    localStorage.setItem("index", i)
                     var arr = [
                         [
                             {
@@ -365,7 +413,6 @@
                                 minWidth: 60,
                                 title: '序号',
                                 type: 'numbers',
-                                fixed: 'left',
                                 align: 'center'
                             },
                             {
@@ -382,10 +429,10 @@
 
                             },
                             {
-                                field: 'shixun_name',
                                 title: '实践项目名称',
                                 minWidth: 200,
-                                align: 'center'
+                                align: 'center',
+                                templet: "#aherf"
                             },
                             {
                                 field: 'shixun_manages',
@@ -410,7 +457,6 @@
                                 field: 'deliver_date',
                                 title: '交付时间',
                                 width: 180,
-                                templet: `<span>{{=new Date(d.deliver_date).toLocaleString('zh-CN')}}</span>`,
                                 align: 'center'
                             },
                             {
@@ -427,7 +473,12 @@
                             },
                             {
                                 title: '审核反馈',
-                                templet: ".markdown",
+                                templet: (d) => {
+                                    if (d.dectect_type === 2) {
+                                        return extractFirstTenCharsAndImage(d.content)
+                                    }
+                                    return ''
+                                },
                                 align: 'center',
                                 minWidth: 100,
                             },
@@ -436,7 +487,6 @@
                                 width: 200,
                                 toolbar: '#shixun_dectect_type',
                                 align: "center",
-                                fixed: 'right'
                             }
                         ]
                     ]

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

@@ -6,15 +6,16 @@ json.data do
     json.shixun_producer d.shixun_producer
     json.shixun_staff d.shixun_staff
     json.type d.shixun_type
-    json.deliver_date  d.deliver_date
-    json.deliver_money d.deliver_money
+    json.deliver_date handled_time_data @times["#{d.id}"]
+    json.deliver_money handled_data d.deliver_money
     json.category d.category
-    json.school_name d.school_name
+    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

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

@@ -23,7 +23,7 @@
         easyeditor.init({
             elem: '.editor' //textarea 元素class
             , uploadUrl: '/api/attachments/' //图片上传地址
-            , uploadSize: '' //限制的上传大小 单位kb 默认 1024k
+            , uploadSize: '1024 * 10' //限制的上传大小 单位kb 默认 1024k
 
         });
         form.on('submit(saveBtn)', function (data) {

data/app/views/educode_sales/shixuns/edit.html.erb

@@ -11,8 +11,8 @@
       <label class="layui-form-label">任务类型:<span style="color: red"> *</span></label>
       <div class="layui-input-block">
         <%= select_tag "category", options_for_select(
-          [["全部", 0], ["管培", 1], ["全职", 2], ["专职", 3]],selected:@item.category
-        ), { include_blank: true } %>
+          [ ["管培", 1], ["全职", 2], ["专职", 3]],selected:@item.category
+        ), {"lay-filter":"Add_company", include_blank: true } %>
       </div>
     </div>
     <div>
@@ -37,30 +37,40 @@
     <div>
       <label class="layui-form-label">项目状态:<span style="color: red"> *</span></label>
       <div class="layui-input-block">
-        <%= select_tag "status", options_for_select(
-          [["全部", 0], ["待建设", 1], ["已签协议", 2], ["建设中", 3],
-           ["审核中", 4], ["返修中", 5], ["已内部发布", 6], ["已公开发布", 7]],  @item.shixun_status
-        ), { include_blank: true } %>
+        <% if  @item.shixun_status == 4 || @item.shixun_status == 5%>
+          <%= select_tag "status", options_for_select(
+            [["审核中", 4], ["返修中", 5]],  @item.shixun_status
+          ), { include_blank: true ,disabled: true} %>
+        <% elsif  @last_dectect == 'refused' %>
+          <%= select_tag "status", options_for_select(
+            [["已内部发布", 6], ["已公开发布", 7],["已付费用",8]],  @item.shixun_status
+          ), { include_blank: true} %>
+        <% else @last_dectect == ''%>
+          <%= select_tag "status", options_for_select(
+            [ ["待建设", 1], ["建设中", 3]],  @item.shixun_status
+          ), { include_blank: true } %>
+        <% end%>
+
       </div>
     </div>
   </div>
 
   <div class="layui-form-item">
-    <label class="layui-form-label" style="width: 90px">项目制作人:<span style="color: red"> *</span></label>
+    <label class="layui-form-label" style="width: 96px">项目制作人:<span style="color: red"> *</span></label>
     <div class="layui-input-block">
-      <div id="producer_id" style="width: 50%;"></div>
+      <div id="producer_id" style="width: 49%;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">
+    <label class="layui-form-label" style="width: 120px">制作完成时间:<span style="color: red"> *</span></label>
+    <div class="layui-input-block" style="width: 89%">
       <input type="text" class="layui-input" name="time"
              id="ID-laydate-demo" placeholder="yyyy-MM-dd"
-             value="<%=@item.deliver_date %>"
+             value="<%=@item.deliver_date.blank? ? "" : @item.deliver_date.strftime("%Y-%m-%d")  %>"
              style="width: 49%;">
     </div>
   </div>
-  <div class="layui-form-item">
+  <div class="layui-form-item" id="money">
     <label class="layui-form-label">交付金额:<span style="color: red"> *</span></label>
     <div class="layui-input-block">
       <input type="number" class="layui-input" value="<%=@item.deliver_money %>" name="money" style="width: 50%;" >
@@ -122,6 +132,18 @@
         producer_id.setValue(<%=@producer_list %>)
         <% end %>
 
+        <% if @item.category != 3 %>
+        $("#money").hide()
+        <% end %>
+        form.on('select(Add_company)', function (data) {
+            {
+                if(data.value === '3'){
+                    $("#money").show()
+                }else{
+                    $("#money").hide()
+                }
+            }
+        });
         function isNull(str){
             return str === "" || str === null
         }
@@ -140,7 +162,7 @@
                 layer.msg('课程组长未选择');
                 return false
             }
-            if(isNull(new_data.money)){
+            if(new_data.category === '3' && isNull(new_data.money)){
                 layer.msg('交付金额未选择');
                 return false
             }