Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html

@@ -49,6 +49,11 @@
         border-radius: 5px;
         padding: 3px
     }
+    /*select超出展示*/
+    #edit_dialog {
+        position: relative;
+        overflow: visible !important;
+    }
 </style>
 <input name="courseInfoId" type="hidden" value="${courseInfo.courseInfoId}"/>
 <div class="layui-row" style="margin: 0 auto;">
@@ -460,9 +465,14 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
                     addOpen(id,title,data,param);
                 }
             }else if (obj.event === 'del') {
+                var url = "/jlw/courseInfo/delete.json",param = {ids:courseInfoId};
+                if (courseInfoId == 0){
+                    url = "/jlw/resourcesInfo/delete.json"
+                    param.ids = obj.data.resourcesInfoId;
+                }
                 layer.confirm('是否确定删除该信息？', function (index) {
                     layer.load();
-                    var ret = Common.postAjax("/jlw/courseInfo/delete.json",{ids:courseInfoId});
+                    var ret = Common.postAjax(url,param);
                     layer.msg(ret.code == 0 ? "删除成功！" : ret.msg, {
                         offset: ['50%'],
                         icon: ret.code == 0 ? 1 : 2,

web/src/main/resources/templates/jlw/schoolClass/add.html

@@ -42,7 +42,7 @@
                     <layui:simpleDictSelect style='layui-input-inline'
                                             type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${schoolClass.universitiesCollegesId!''}"
                                             id="universityFacultyId" name="universityFacultyId"
-                                            value="${universityFacultyId!''}" layFilter="select_universityFacultyIds"
+                                            value="${schoolClass.universityFacultyId!''}" layFilter="select_universityFacultyIds"
                                             lay-verify="required"/>
                 </div>
             </div>

web/src/main/resources/templates/jlw/teacher/add.html

@@ -25,7 +25,7 @@
             <div class="layui-inline">
                 <label class="layui-form-label"><span class="req">*</span>所属院系：</label>
                 <div class="layui-input-inline">
-                    <layui:simpleDictSelect style='layui-input-inline'
+                    <layui:simpleDictSelect style='layui-input-inline' value="${teacher.universityFacultyId}"
                                             type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${universitiesCollegesInfo.universitiesCollegesId!''},find_in_set(org_id, ${user.get().orgId!''})"
                                             id="universityFacultyId" name="universityFacultyId" lay-verify="required"
                                             layFilter="select_universityFacultyIds"/>
@@ -36,12 +36,13 @@
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">
-                <label class="layui-form-label"><span class="req">*</span>专业：</label>
+                <label class="layui-form-label"><span class="req">*</span>所属专业：</label>
                 <div class="layui-input-inline">
-                    <select name="universitySystemId" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-            </div>
+                    <layui:simpleDictSelect style='layui-input-inline'
+                                            type="university_system.university_system_name.university_system_status=1,university_faculty_id=${teacher.universityFacultyId!''},find_in_set(org_id, ${user.get().orgId!''})"
+                                            id="universitySystemId" name="universitySystemId"
+                                            value="${teacher.universitySystemId!''}" lay-verify="required"/>
+                </div>
         </div>
     </div>
     </div>