educode_sales 1.10.49 → 1.10.58

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

@@ -1,21 +1,25 @@
 json.data do
   json.array! @shixuns do |d|
     json.shixun_manages handled_data d.shixun_manages
-    json.shixun_producer d.shixun_producer
-    json.shixun_staff handled_data d.shixun_staff
+    json.shixun_producer handled_data d.shixun_producer
+    json.shixun_staff handled_data @shixun_staffs["#{d.id}"]
     json.type d.shixun_type
     json.deliver_date  handled_time_data d.deliver_date
     json.reception_at  handled_time_data d.reception_at
-    json.school_name d.school_name
+    json.school_name handled_data d.shixun_school
     json.identifier handled_data d.identifier
+    json.subjects_identifier d.subjects_identifier
     json.subject_name handled_data(d.subject_name)
     json.shixun_name handled_data d.name
     json.shixun_status d.shixun_status
     json.level d.level
+    json.s_identifier d.s_identifier
     json.id d.id
     json.max_manage "喻银凤"
-    json.dectect_feedback "审核反馈内容"
-    json.commit_dectect_time handled_time_data Time.now
+    json.dectect_feedback handled_data d.dectects_content
+    json.commit_dectect_time handled_time_data_accurate d.shixun_dectects_time
+    json.money handled_data d.deliver_money
+    json.link d.link
   end
 end
 json.code 0

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

@@ -11,7 +11,7 @@
       <div class="layui-input-block">
         <%= select_tag "category", options_for_select(
           [["管培", 1], ["全职", 2], ["专职", 3]]
-        ), { include_blank: true } %>
+        ),{"lay-filter":"Add_company",include_blank: true}%>
       </div>
     </div>
     <div>
@@ -37,15 +37,14 @@
       <label class="layui-form-label">项目状态:<span style="color: red"> *</span></label>
       <div class="layui-input-block">
         <%= select_tag "status", options_for_select(
-          [["待建设", 1], ["已签协议", 2], ["建设中", 3],
-           ["审核中", 4], ["返修中", 5], ["已内部发布", 6], ["已公开发布", 7]]
+          [["待建设", 1],  ["建设中", 3]]
         ), { include_blank: true } %>
       </div>
     </div>
   </div>
 
   <div class="layui-form-item">
-    <label class="layui-form-label" style="width: 100px">项目关联链接:</label>
+    <label class="layui-form-label" style="width: 102px">项目关联链接:</label>
     <div class="layui-input-block">
       <input type="text" name="link" class="layui-input" style="width: 49%;">
     </div>
@@ -57,7 +56,7 @@
     </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: 100px">项目制作人:<span style="color: red"> *</span></label>
     <div class="layui-input-block">
       <div id="producer_id" style="width: 50%;"></div>
     </div>
@@ -69,14 +68,14 @@
     </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: 112px;">制作完成时间:<span style="color: red"> *</span></label>
+    <div class="layui-input-block" style="width: 91%">
       <input type="text" class="layui-input" name="time"
              id="ID-laydate-demo" placeholder="yyyy-MM-dd"
              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" name="money" style="width: 50%;" >
@@ -179,6 +178,17 @@
             tips: '- -',
             multiple: true
         })
+        $("#money").hide()
+        form.on('select(Add_company)', function (data) {
+            {
+                if(data.value === '3'){
+                    $("#money").show()
+                }else{
+                    $("#money").hide()
+                }
+            }
+        });
+
         function isNull(str){
             return str === "" || str === null
         }
@@ -194,12 +204,12 @@
                 layer.msg('项目级别未选择');
                 return false
             }
-            if(isNull(new_data.manage_id)){
-                layer.msg('课程组长未选择');
+            if(new_data.category === '3' && isNull(new_data.money)){
+                layer.msg('交付金额未选择');
                 return false
             }
-            if(isNull(new_data.money)){
-                layer.msg('交付金额未选择');
+            if(isNull(new_data.manage_id)){
+                layer.msg('课程组长未选择');
                 return false
             }
             if(isNull(new_data.name)){