educode_sales 1.10.49 → 1.10.58

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

@@ -11,9 +11,9 @@
     </div>
   </div>
   <div class="layui-form-item" >
-    <label class="layui-form-label"  style="width: 90px">实践课程名称:</label>
-    <div class="layui-input-block"  >
-      <div id="subject_ids" style="width: 50%;"></div>
+    <label class="layui-form-label" style="width: 112px">实践课程名称:<span style="color: red"> *</span></label>
+    <div class="layui-input-block">
+      <div id="subject_ids" style="width: 48%;margin-left: 20px"></div>
     </div>
   </div>
 
@@ -30,7 +30,7 @@
     </div>
   </div>
   <div class="layui-form-item">
-    <label class="layui-form-label">课程经理:</label>
+    <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>
@@ -113,7 +113,33 @@
         manage_id.setValue(<%=@value_list %>)
         <% end %>
 
+        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.business_id)){
+                    layer.msg('请选商机');
+                    return false
+            }
+            if(isNull(new_data.subject_ids)){
+                    layer.msg('请选实践课程');
+                    return false
+            }
+            if(isNull(new_data.manage_id)){
+                    layer.msg('请选课堂经理');
+                    return false
+            }
+            if(isNull(new_data.state)){
+                    layer.msg('请选状态');
+                    return false
+            }
+
+
             var business = data.field
             $.ajax('/missions/business_courses/'+business.id, {
                 method: 'PATCH',

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

@@ -54,11 +54,11 @@
   </div>
 </script>
 <script type="text/html" id="show_phone_number">
-  <span type="text" id="{{= d.p_sale_staff1 + d.id}}"
-        onmouseover="show('手机号：13711111111'+'{{= d.id}}','{{=d.p_sale_staff1 + d.id}}')"
-        onmouseleave="close_tips()">
+<!--  <span type="text" id="{{= d.p_sale_staff1 + d.id}}"-->
+<!--        onmouseover="show('手机号：13711111111'+'{{= d.id}}','{{=d.p_sale_staff1 + d.id}}')"-->
+<!--        onmouseleave="close_tips()">-->
     {{= d.subject_manages }}
-  </span>
+<!--  </span>-->
 </script>
 
 <!-- constructed:待建设， signed: 已签协议，construction: 建设中，completed: 已完成，delivered: 已交付, accepted: 已验收-->
@@ -178,9 +178,10 @@
                 }
             ]
         ]
-
+        var tableDataCount = 0
         table.render({
             elem: '#table',
+            title: '商机交付课程列表',
             where: {q: form.val()},
             url: '/missions/business_courses',
             // data: temp_data,
@@ -190,7 +191,10 @@
             cols: cols_table,
             limit: 10,
             limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
-            page: true
+            page: true,
+            done: function(res, curr, count){
+                tableDataCount = count;//记录所有数据数量
+            }
         })
         var sort = {}, search = {};
         // 监听搜索操作
@@ -214,7 +218,7 @@
                 },
                 where: {q: {}}
             }, 'data');
-            $(".layui-form").reset();
+            $(".layui-form")[0].reset();
             form.render()
             return false;
         });
@@ -231,7 +235,7 @@
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
-                    shadeClose: true,
+                    shadeClose: false,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content
@@ -249,7 +253,7 @@
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
-                    shadeClose: true,
+                    shadeClose: false,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content,
@@ -258,7 +262,7 @@
                 });
                 return false;
             } else if (obj.event === 'show_list_shixuns') {
-                localStorage.setItem("business_delvier_subject_id",data.id)
+                localStorage.setItem("business_delvier_subject_id_shixuns",data.id)
                 var content = miniPage.getHrefContent('/missions/business_courses/list_shixuns?id='+data.id);
                 var openWH = miniPage.getOpenWidthHeight();
                 list_projects = layer.open({
@@ -266,7 +270,7 @@
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
-                    shadeClose: true,
+                    shadeClose: false,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content,
@@ -290,7 +294,7 @@
                     type: 1,
                     shade: 0.2,
                     maxmin: true,
-                    shadeClose: true,
+                    shadeClose: false,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
                     content: content,
@@ -298,6 +302,24 @@
                 $(window).on("resize", function () {
                 });
                 return false;
+            }else if(obj.event === 'list'){
+                table.reload('table',{
+                    page: 1,
+                    limit:tableDataCount, //加载所有数据
+                    done:function (){
+                        //导出所有数据
+                        table.exportFile("table",false,"xls");
+                        //恢复数据分页显示
+                        table.reload('table',{
+                            page: 1,
+                            limit:20,
+                            done:function (res, curr, count){
+                                tableDataCount = count;
+                            }
+                        })
+
+                    }
+                })
             }
         });
 

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

@@ -6,10 +6,10 @@ json.data do
     json.state deliver.status
     json.time handled_time_data deliver.delvier_date
     json.id deliver.id
-    json.staff_name handled_data b.staff_name
+    json.staff_name handled_data handled_data b.staff_name
     json.subject_progress deliver.subject_competed_count
     json.shixun_progress deliver.shixun_competed_count
-    json.subject_manages deliver.subject_manages
+    json.subject_manages handled_data deliver.subject_manages
   end
 end
 json.code 0

data/app/views/educode_sales/business_courses/list_shixuns.html.erb

@@ -1,44 +1,65 @@
+<style>
+    .layui-table-cell{
+        height: auto !important;
+        width: auto;
+        white-space: normal;
+        /*line-height: 28px;*/
+    }
+</style>
 <div class="min-height-table" style="margin: 20px">
   <div>
-    <form class="layui-form layui-form-pane" lay-filter="list_shixun_search_form">
-      <div class="layui-inline show_item_contract borders">
-        <label class="layui-form-label">任务类型</label>
-        <div class="layui-input-inline">
-          <%= select_tag "category", options_for_select(
-            [["全部", 0], ["管培", 1], ["全职", 2], ["专职", 3]]
-          ), { include_blank: true } %>
+    <form class="layui-form layui-form-pane"  id="list_shixun_search" lay-filter="list_shixun_search_form">
+      <div>
+        <div class="layui-inline show_item_contract borders">
+          <label class="layui-form-label">任务类型</label>
+          <div class="layui-input-inline">
+            <%= select_tag "category", options_for_select(
+              [["全部", 0], ["管培", 1], ["全职", 2], ["专职", 3]]
+            ), { include_blank: true } %>
+          </div>
         </div>
-      </div>
-      <div class="layui-inline show_item_contract">
-        <label class="layui-form-label">项目级别</label>
-        <div class="layui-input-inline">
-          <%= select_tag "level", options_for_select(
-            [["全部", 0], ["不明确", 1], ["重要紧急", 2], ["重要不紧急", 3],
-             ["不重要紧急", 4], ["不重要不紧急", 5]], selected: 0
-          ), { include_blank: true } %>
+        <div class="layui-inline show_item_contract">
+          <label class="layui-form-label">项目级别</label>
+          <div class="layui-input-inline">
+            <%= select_tag "level", options_for_select(
+              [["全部", 0], ["不明确", 1], ["重要紧急", 2], ["重要不紧急", 3],
+               ["不重要紧急", 4], ["不重要不紧急", 5]], selected: 0
+            ), { include_blank: true } %>
+          </div>
         </div>
-      </div>
-      <div class="layui-inline show_item_contract borders">
-        <label class="layui-form-label">项目状态</label>
-        <div class="layui-input-inline">
-          <%= select_tag "status", options_for_select(
-            [["全部", 0], ["待建设", 1], ["已签协议", 2], ["建设中", 3],
-             ["审核中", 4], ["返修中", 5], ["已内部发布", 6], ["已公开发布", 7]], selected: 0
-          ), { include_blank: true } %>
+        <div class="layui-inline show_item_contract borders">
+          <label class="layui-form-label">项目状态</label>
+          <div class="layui-input-inline">
+            <%= select_tag "status", options_for_select(
+              [["全部", 0], ["待建设", 1], ["已签协议", 2], ["建设中", 3],
+               ["审核中", 4], ["返修中", 5], ["已内部发布", 6], ["已公开发布", 7],
+               ["已付费用",8],["审核通过",9]], selected: 0
+            ), { include_blank: true } %>
+          </div>
         </div>
+
       </div>
-      <div class="layui-inline borders">
-        <label class="layui-form-label" style="width: 120px">实践项目名称</label>
-        <div class="layui-input-inline">
-          <input type="text" name="shixun_name" class="layui-input">
+      <div>
+        <div class="layui-inline borders">
+          <label class="layui-form-label" style="width: 150px">实践项目名称</label>
+          <div class="layui-input-inline">
+            <input type="text" name="shixun_name" class="layui-input">
+          </div>
+        </div>
+        <div class="layui-inline borders">
+          <label class="layui-form-label" style="width: 150px">实践课程名称</label>
+          <div class="layui-input-inline">
+            <input type="text" name="subject_name" class="layui-input">
+          </div>
+        </div>
+        <div class="layui-inline borders">
+          <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+          </button>
+          <button type="submit" id="search_list_shixuns_contract" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_list_shixuns_contract">搜索
+          </button>
         </div>
       </div>
-      <div class="layui-inline borders">
-        <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_list_shixuns_contract">搜索
-        </button>
-      </div>
+
     </form>
   </div>
 
@@ -49,23 +70,7 @@
 </div>
 
 
-<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 type="text/html" id="show_level">
   {{# if(d.level === 1){ }}
   <span>不明确</span>
@@ -79,7 +84,20 @@
   <span>不重要不紧急</span>
   {{# } }}
 </script>
-
+<script type="text/html" id="aherf">
+  {{# if(d.identifier !== null && d.identifier !== ''){ }}
+  <a target="_blank" style="color:deepskyblue" href="<%= @url %>/paths/{{= d.subjects_identifier}}">{{=d.subjects_name}}</a>
+  {{# } else { }}
+  <a  style="color:deepskyblue" >{{=d.subjects_name}}</a>
+  {{# } }}
+</script>
+<script type="text/html" id="shixun_name_link">
+  {{# if(d.identifier !== null && d.identifier !== ''){ }}
+  <a target="_blank" style="color:deepskyblue" href='<%=@url %>/shixuns/{{=d.s_identifier}}/challenges'>{{=d.shixun_name}}</a>
+  {{# } else { }}
+  <a  style="color:deepskyblue" >{{=d.shixun_name}}</a>
+  {{# } }}
+</script>
 
 <script type="text/html" id="show_type">
   {{# if(d.shixun_type === 1){ }}
@@ -92,7 +110,26 @@
 </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 `<p>${firstTenChars}</p> ${imageTag}`
+    }
     layui.use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown'], function () {
         var laydate = layui.laydate,
           form = layui.form,
@@ -112,29 +149,35 @@
                 {
                     field: 'id',
                     width: 60,
-                    fixed: 'left',
                     title: '序号', type: 'numbers',
                     align: 'center'
                 },
                 {
-                    field: 'type',
+                    field: 'subjects_name',
+                    title: '实践课程名称',
+                    width: 150,
+                    align: 'center',
+                    templet: "#aherf"
+                },
+                {
+                    field: 'category',
                     title: '任务类型',
                     width: 150,
                     align: 'center',
-                    templet: '#show_type'
                 },
                 {
                     field: 'shixun_name',
                     title: '实践项目名称',
                     width: 150,
-                    align: 'center'
+                    align: 'center',
+                    templet: '#shixun_name_link'
                 },
                 {
                     field: 'level',
                     title: '项目级别',
                     width: 150,
                     align: 'center',
-                    templet: '#show_level'
+                    // templet: '#show_level'
                 },
                 {
                     field: 'deliver_date',
@@ -143,10 +186,9 @@
                     align: 'center'
                 },
                 {
-                    field: 'state',
+                    field: 'shixun_status',
                     title: '项目状态',
                     width: 150,
-                    templet: '#show_state',
                     align: 'center'
                 },
                 {
@@ -159,7 +201,13 @@
                     field: 'dectect_feedback',
                     title: '审核反馈',
                     width: 150,
-                    align: 'center'
+                    align: 'center',
+                    templet: (d)=>{
+                        if(d.dectect_feedback){
+                            return extractFirstTenCharsAndImage(d.dectect_feedback)
+                        }
+                        return ''
+                    },
                 },
                 {
                     field: 'shixun_producer',
@@ -184,11 +232,21 @@
 
 
 
-        var id = localStorage.getItem("business_delvier_subject_id")
+        var id = localStorage.getItem("business_delvier_subject_id_shixuns")
+        localStorage.removeItem("business_delvier_subject_id_shixuns")
+        var subject_id = localStorage.getItem("subject_id")
+        localStorage.removeItem("subject_id")
+        var url = ""
+        if(id !== '' && id !== null){
+            url = '/missions/business_courses/list_shixuns?id='+id
+        }else if(subject_id !== '' && subject_id !== null){
+            url = '/missions/business_courses/list_shixuns?subject_id='+subject_id
+        }
         console.log(id)
+        console.log(subject_id)
         var shixun_table = table.render({
             elem: '#shixun_table',
-            url: '/missions/business_courses/list_shixuns?id=' + id,
+            url: url,
             data: data,
             autoSort: false,
             where: {q: data},
@@ -199,15 +257,25 @@
             page: true,
             skin: 'line'
         });
-
+        // 重置
+        form.on('submit(reset_business_search)', function (data) {
+            table.reload('shixun_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: {}}
+            }, 'data');
+            document.getElementById("list_shixun_search").reset();
+            form.render()
+            return false;
+        });
 
         var data = form.val("list_shixun_search_form");
         var sort = {}, search = {};
         form.on('submit(search_list_shixuns_contract)', function (data) {
             search = data.field
-            search.id = localStorage.getItem("business_delvier_subject_id")
             console.log(search)
-            table.reload('contact_table', {
+            table.reload('shixun_table', {
                 page: {
                     curr: 1
                 },

data/app/views/educode_sales/business_courses/list_shixuns.json.jbuilder

@@ -1,16 +1,22 @@
 json.data do
   json.array! @shixuns do |d|
     json.shixun_manages handled_data d.shixun_manages
-    json.shixun_producer d.shixun_producer
-    json.type   real_shixun_type d.shixun_type
-    json.time  handled_time_data d.deliver_date
+    json.shixun_producer handled_data d.shixun_producer
+    json.shixun_staff handled_data d.shixun_staff
+    json.category   real_shixun_category d.category
+    json.deliver_date  handled_time_data d.deliver_date
     json.shixun_name handled_data d.s_name
-    json.state  d.shixun_status
+
+    json.s_identifier handled_data d.s_identifier
+    json.shixun_status  real_shixun_status d.shixun_status
     json.level real_shixun_level d.level
+    json.deliver_date  handled_time_data d.deliver_date
     json.id d.id
+    json.subjects_name d.subjects_name
+    json.subjects_identifier d.subjects_identifier
     json.max_manage "喻银凤"
-    json.dectect_feedback "审核反馈内容"
-    json.commit_dectect_time handled_time_data Time.now
+    json.dectect_feedback handled_data d.dectect_content
+    json.commit_dectect_time handled_time_data_accurate d.dectect_time
   end
 end
 json.code 0

data/app/views/educode_sales/business_courses/list_subjects.html.erb

@@ -1,6 +1,6 @@
 <div class="min-height-table" style="margin:20px">
   <div>
-    <form class="layui-form layui-form-pane " lay-filter="search_form">
+    <form class="layui-form layui-form-pane " id="list_subject_search"  lay-filter="search_form">
       <!--      <div class="layui-row">-->
       <!--        <h2 style="padding-left: 25px">商机名称-实践课程列表</h2>-->
       <!--      </div>-->
@@ -13,17 +13,17 @@
         </div>
       </div>
       <div class="layui-inline borders">
-        <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" name="name" class="layui-input" value="">
         </div>
       </div>
-      <div class="layui-inline borders">
-        <label class="layui-form-label">交付单位</label>
-        <div class="layui-input-inline">
-          <div id="school_id" style="width: 300px;"></div>
-        </div>
-      </div>
+<!--      <div class="layui-inline borders">-->
+<!--        <label class="layui-form-label">交付单位</label>-->
+<!--        <div class="layui-input-inline">-->
+<!--          <div id="school_id" style="width: 300px;"></div>-->
+<!--        </div>-->
+<!--      </div>-->
       <div class="layui-inline borders">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
         </button>
@@ -42,18 +42,18 @@
   <a lay-event="show_list_shixun" style="color: deepskyblue">{{= d.shixuns_completed_progress }}</a>
 </script>
 <script id="show_state_course" type="text/html">
-  {{# if(d.status === 0){ }}
+  {{# if(d.status === 2 && d.public !== 1 && d.public !== 2){ }}
+  <span>已发布</span>
+  {{# } else if( d.status === 0 ){ }}
   <span>编辑中</span>
-  {{# } else if(d.status === 1){ }}
+  {{# }else if(d.public === 1 && d.status === 2){ }}
   <span>审核中</span>
-  {{# }else if(d.public === 2){ }}
+  {{# } else if(d.public === 2 &&  d.status === 2){ }}
   <span>已公开</span>
-  {{# } else if(d.status === 2){ }}
-  <span>已发布</span>
   {{# } }}
 </script>
 <script id="educode_link" type="text/html">
-  <a href="<%= @url %>{{= d.identifier}}" target="_blank" style="color: #1E9FFF">{{= d.name}}</a>
+  <a href="<%= @url %>/paths/{{= d.identifier}}" target="_blank" style="color: #1E9FFF">{{= d.name}}</a>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown'], function () {
@@ -124,34 +124,19 @@
                 {
                     title: '状态',
                     align: 'center',
-                    templet: "#show_state_course"
+                    field: 'shixun_status'
+                    // templet: "#show_state_course"
                 },
                 {
-                    field: 'time',
+                    field: 'deliver_date',
                     title: '交付时间',
                     align: 'center'
-                },
-                {
-                    field: 'school',
-                    title: '交付单位',
-                    align: 'center'
-                },
-                {
-                    field: 'p_sale_staff',
-                    title: '销售',
-                    align: 'center'
-                },
-                {
-                    field: 'p_sale_staff1',
-                    title: '课程经理',
-                    align: 'center'
                 }
             ]
         ]
 
 
         var id = localStorage.getItem("business_delvier_subject_id")
-        console.log(id)
         var subjects_table = table.render({
             elem: '#subjects_table',
             url: '/missions/business_courses/list_subjects?id=' + id,
@@ -166,7 +151,18 @@
             page: true,
             skin: 'line'
         });
-
+        // 重置
+        form.on('submit(reset_business_search)', function (data) {
+            table.reload('subjects_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: {}}
+            }, 'data');
+            document.getElementById("list_subject_search").reset();
+            form.render()
+            return false;
+        });
         var sort = {}, search = {};
         // 监听搜索操作
         form.on('submit(search_bussiness_contract)', function (data) {
@@ -185,7 +181,6 @@
             var data = obj.data;
             // 编辑按钮监听
             if (obj.event === 'show_list_shixun') {
-                console.log(233)
                 localStorage.setItem("subject_id", data.id)
                 var content = miniPage.getHrefContent('/missions/business_courses/list_shixuns');
                 var openWH = miniPage.getOpenWidthHeight();

data/app/views/educode_sales/business_courses/list_subjects.json.jbuilder

@@ -2,10 +2,15 @@ json.data do
   json.array! @subjects do |item|
     json.identifier item.identifier
     json.name item.name
-    json.status item.status
+    # p item.status, item.public
+    # json.status item.status
+    p status item
+    json.shixun_status status item
     json.public item.public
     json.id item.id
-    json.shixuns_completed_progress item.shixuns_completed_progress
+    json.shixuns_completed_progress item.shixun_compeled_count
+    json.deliver_date item.reception_at
+
   end
 end
 json.code 0