导出、学生添加

web/src/main/resources/static/js/jlw/student/add.js

@@ -68,9 +68,10 @@ layui.define([ 'form', 'laydate', 'table','studentApi'], function(exports) {
         Common.openDlg(url,"");
     });
 
-    //根据所选院校查询班级
+    //根据所选院校查询班级、查询院系
     form.on('select(select_universitiesColleges)', function (obj) {
         Lib.getSchoolClass($("select[name='classId']"),obj.value);
+        Lib.getUniversityFacultys($("select[name='universityFacultyId']"),obj.value);
     });
     //查询专业
     form.on('select(select_universityFaculty)', function (obj) {

web/src/main/resources/static/js/jlw/student/index.js

@@ -136,7 +136,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         layer.close(index);
                         var param = getParam();
                         var url = "/jlw/student/export.json";
-                        var value = ""
+                        var value = "";
                         for(var k in param) {
                             if(!$.isEmpty(param[k])){
                                 value+='&'+k+"="+param[k];
@@ -145,7 +145,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         if(!$.isEmpty(value)){
                             url = url +"?" + value.slice(1);
                         }
-                        $.downFile(Common.ctxPath +url);
+                        $.downFile(Common.ctxPath +url,"学生信息表");
                     });
                 }
             };

web/src/main/resources/static/js/jlw/teacher/index.js

@@ -101,7 +101,19 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                 }, export: function () {//导出
                     layer.confirm('是否确定导出教师信息？', function (index) {
                         layer.close(index);
-                        $.downFile(Common.ctxPath + "/jlw/teacher/export.json");
+                        let param = $("#searchForm").serializeJson();
+                        let url = "/jlw/teacher/export.json";
+                        let value = "";
+                        for(let k in param) {
+                            if(!$.isEmpty(param[k])){
+                                value+='&'+k+"="+param[k];
+                            }
+                        }
+                        if(!$.isEmpty(value)){
+                            url = url +"?" + value.slice(1);
+                        }
+                        $.downFile(Common.ctxPath + url,"教师信息表格");
+
                     });
                 }
             };

web/src/main/resources/static/js/jlw/universitiesColleges/index.js

@@ -106,7 +106,18 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                 },
                 exportDocument: function () {
                     layer.confirm('是否确定导院校信息？', function (index) {
-                        $.downFile(Common.ctxPath + "/jlw/universitiesColleges/export.json",'院校管理员信息表',"POST");
+                        let param = $("#searchForm").serializeJson();
+                        let url = "/jlw/universitiesColleges/export.json";
+                        let value = "";
+                        for(let k in param) {
+                            if(!$.isEmpty(param[k])){
+                                value+='&'+k+"="+param[k];
+                            }
+                        }
+                        if(!$.isEmpty(value)){
+                            url = url +"?" + value.slice(1);
+                        }
+                        $.downFile(Common.ctxPath + url,'院校管理员信息表',"POST");
                         layer.close(index);
                     });
                 },

web/src/main/resources/static/js/jlw/universityFaculty/add.js

@@ -14,14 +14,14 @@ layui.define([ 'form', 'laydate', 'table','universityFacultyApi'], function(expo
                      if(!$.isEmpty(universityFacultyId)){
                          universityFacultyApi.updateUniversityFaculty($('#addForm'),function(){
                              window.parent.location.reload();
-                             parent.window.dataReload();
+                             //parent.window.dataReload();
                              Common.info("更新成功");
                              Lib.closeFrame();
                          });
                      }else{
                          universityFacultyApi.addUniversityFaculty($('#addForm'),function(){
                              window.parent.location.reload();
-                             parent.window.dataReload();
+                             //parent.window.dataReload();
                              Common.info("添加成功");
                              Lib.closeFrame();
                          });

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

@@ -28,7 +28,7 @@
                 <label class="layui-form-label"><span class="req">*</span>所属院系：</label>
                 <div class="layui-input-inline">
                     <layui:simpleDictSelect style='layui-input-inline'
-                                            type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${universitiesCollegesId!''},find_in_set(org_id, ${user.get().orgId!''})"
+                                            type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${universitiesCollegesId!''},${user.get().isAdmin ? '1=1' : 'find_in_set(org_id, ' + user.get().orgId + ')'}"
                                             lay-verify="required"
                                             id="universityFacultyId" name="universityFacultyId" value="${universityFacultyId}" layFilter="select_universityFaculty"/>
                 </div>
@@ -41,7 +41,8 @@
             <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' value="${universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId}"
+                    <layui:simpleDictSelect style='layui-input-inline' value="${universitySystemId}"
+                                            type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId!''}"
                                             id="universitySystemId" name="universitySystemId" layFilter="select_universitySystemId"
                                             lay-verify="required"/>
                 </div>