'commit'

WebRoot/view/tb/zbdc/cgzb_jnygz.html

@@ -1205,7 +1205,6 @@
                                     </div>
 
                                 </div>
-
                                 <div class="layui-row" style="margin-top: 10px;">
                                     <div class="layui-col-xs4">
                                         <div class="layui-form-item">
@@ -1240,8 +1239,6 @@
                                     </div>
 
                                 </div>
-
-
                                 <div class="layui-row" style="margin-top: 10px;">
 
                                     <div class="layui-col-xs4">
@@ -1277,7 +1274,6 @@
                                     </div>
 
                                 </div>
-
                                 <div class="layui-row" style="margin-top: 10px;">
 
                                     <div class="layui-col-xs4">
@@ -1301,13 +1297,11 @@
 
                                 </div>
 
-
-
                             </div>
 
                             <div class="layui-card-header header_top">心理辅导室</div>
                             <div class="layui-card-body">
-                                <div class="layui-row" style="margin-top: 10px;">
+                                <div class="layui-row">
                                     <div class="layui-col-xs4">
                                         <div class="layui-form-item">
                                             <label class="layui-form-label"><span class="require-star"></span>心理辅导室（室数）：
@@ -1338,7 +1332,7 @@
 
                             <div class="layui-card-header header_top">卫生室</div>
                             <div class="layui-card-body">
-                                <div class="layui-row" style="margin-top: 10px;">
+                                <div class="layui-row">
                                     <div class="layui-col-xs4">
                                         <div class="layui-form-item">
                                             <label class="layui-form-label"><span class="require-star"></span>卫生室（室数）：
@@ -1402,7 +1396,6 @@
                                         </div>
                                     </div>
                                 </div>
-
                                 <div class="layui-row" style="margin-top: 10px;">
 
                                     <div class="layui-col-xs4">
@@ -1462,7 +1455,6 @@
                                     </div>
 
                                 </div>
-
                                 <div class="layui-row" style="margin-top: 10px;">
                                     <div class="layui-col-xs4">
                                         <div class="layui-form-item">
@@ -1482,8 +1474,7 @@
                                     </div>
 
                                 </div>
-
+                                
-
                             </div>
 
                         </div>

WebRoot/view/tb/zbdc/examine/examine_area.html

@@ -314,8 +314,17 @@
             });
 
             table.on('tool(myTable)', function (obj) {
+                console.log(obj.data.school_type_id)
                 if (obj.event === 'view') {
-                    window.location.href = "/QingLong/view/tb/zbdc/examine/data_all.html?bureau_id=" + obj.data.bureau_id + "&flag=1";
+                    if (obj.data.school_type_id == 211) {
+                        window.location.href = "/QingLong/view/tb/zbdc/examine/data_all_xx.html?bureau_id=" + obj.data.bureau_id + "&flag=1";
+                    } else if (obj.data.school_type_id == 311) {
+                        window.location.href = "/QingLong/view/tb/zbdc/examine/data_all_cz.html?bureau_id=" + obj.data.bureau_id + "&flag=1";
+                    }
+                    else if (obj.data.school_type_id == 312) {
+                        window.location.href = "/QingLong/view/tb/zbdc/examine/data_all_jnygz.html?bureau_id=" + obj.data.bureau_id + "&flag=1";
+                    }
+
                 }
             });
 

WebRoot/view/tb/zbdc/sjcx_cgzbcx.html

@@ -115,6 +115,11 @@
                 </button>
             </div>
 
+            <button class="layui-btn layui-btn-sm" lay-submit lay-filter="export" style="position: fixed;right: 20px;top:20px">
+                <i class="layui-icon layui-icon-download-circle"></i>
+                导出
+            </button>
+
             <table class="layui-table" id="myTable"></table>
         </div>
     </div>
@@ -317,6 +322,13 @@
                 return false;
             });
 
+            form.on('submit(export)', function () {
+                var url = "/QingLong/zbdc/exportQueryCgzb?export_flag=1&page=1&limit=1000&area_id=" + $("#xzqhId").val() + "&school_type_id=" + $("#xxlxId").val() + "&keyword=" + $("#xxmc").val();
+                window.location.href = url;
+                // 阻止表单的默认提交行为
+                return false;
+            });
+
             form.on('select(xzqh)', function () {
                 tableRender();
                 // 阻止表单的默认提交行为