diff --git a/WebRoot/view/tb/zbdc/examine/data_all_cz.html b/WebRoot/view/tb/zbdc/examine/data_all_cz.html
index c61da6be..b2bed27e 100644
--- a/WebRoot/view/tb/zbdc/examine/data_all_cz.html
+++ b/WebRoot/view/tb/zbdc/examine/data_all_cz.html
@@ -129,7 +129,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-row jcxx-layui-row">                   
+                <div class="layui-row jcxx-layui-row">
                     <div class="layui-col-xs6">
                         <div class="layui-form-item">
                             <label class="layui-form-label" style="width: 115px !important;">学生数：</label>
@@ -147,8 +147,8 @@
                         </div>
                     </div>
                 </div>
-                
-                
+
+
                 <div class="layui-row jcxx-layui-row">
                     <div class="layui-col-xs6">
                         <div class="layui-form-item">
@@ -167,7 +167,7 @@
                         </div>
                     </div>
                 </div>
-                
+
 
             </div>
             <div class="layui-tab-item">
@@ -1053,9 +1053,9 @@
                     $("#top_bureau_name").html(res.bureau_name);
 
                     $("#bureau_name").html(res.bureau_name);
-                    $("#school_type_name").html(res.school_type_name);                    
-                    $("#cz_student_count").html(res.cz_student_count);                    
-                    $("#cz_class_count").html(res.cz_class_count);                    
+                    $("#school_type_name").html(res.school_type_name);
+                    $("#cz_student_count").html(res.cz_student_count);
+                    $("#cz_class_count").html(res.cz_class_count);
                     $("#cz_teacher_count").html(res.cz_teacher_count);
                     $("#cz_zhuanren_count").html(res.cz_zhuanren_count);
                 }
@@ -1571,7 +1571,11 @@
             }
 
             form.on('submit(back)', function () {
-                window.location.href = "/QingLong/view/tb/zbdc/examine/school_list_details.html?flag=2";
+                if (flag == "11") {
+                    window.location.href = "/QingLong/view/tb/zbdc/examine/examine_city_area_list.html?area_id=" + areaId;
+                } else {
+                    window.location.href = "/QingLong/view/tb/zbdc/examine/school_list_details.html?flag=2";
+                }
 
                 // 阻止表单的默认提交行为
                 return false;
diff --git a/WebRoot/view/tb/zbdc/examine/data_all_jnygz.html b/WebRoot/view/tb/zbdc/examine/data_all_jnygz.html
index 389df5a9..ac9646cf 100644
--- a/WebRoot/view/tb/zbdc/examine/data_all_jnygz.html
+++ b/WebRoot/view/tb/zbdc/examine/data_all_jnygz.html
@@ -160,8 +160,8 @@
                                 <span class="text" id="xx_class_count"></span>
                             </div>
                         </div>
-                    </div>                   
-                   
+                    </div>
+
                 </div>
 
                 <div class="layui-row jcxx-layui-row">
@@ -181,11 +181,11 @@
                             </div>
                         </div>
                     </div>
-                    
+
                 </div>
 
 
-                <div class="layui-row jcxx-layui-row">  
+                <div class="layui-row jcxx-layui-row">
                     <div class="layui-col-xs6">
                         <div class="layui-form-item">
                             <label class="layui-form-label" style="width: 115px !important;">初中部学生数：</label>
@@ -193,8 +193,8 @@
                                 <span class="text" id="cz_student_count"></span>
                             </div>
                         </div>
-                    </div>                 
-                    
+                    </div>
+
                     <div class="layui-col-xs6">
                         <div class="layui-form-item">
                             <label class="layui-form-label" style="width: 115px !important;">初中部班级数：</label>
@@ -204,8 +204,8 @@
                         </div>
                     </div>
                 </div>
-               
-                
+
+
                 <div class="layui-row jcxx-layui-row">
                     <div class="layui-col-xs6">
                         <div class="layui-form-item">
@@ -215,7 +215,7 @@
                             </div>
                         </div>
                     </div>
-                    
+
                     <div class="layui-col-xs6">
                         <div class="layui-form-item">
                             <label class="layui-form-label" style="width: 115px !important;">初中部专任教师数：</label>
@@ -1663,9 +1663,9 @@
                     $("#bureau_name").html(res.bureau_name);
                     $("#school_type_name").html(res.school_type_name);
                     $("#xx_student_count").html(res.xx_student_count);
-                    $("#cz_student_count").html(res.cz_student_count);                    
+                    $("#cz_student_count").html(res.cz_student_count);
                     $("#xx_class_count").html(res.xx_class_count);
-                    $("#cz_class_count").html(res.cz_class_count);                    
+                    $("#cz_class_count").html(res.cz_class_count);
                     $("#xx_teacher_count").html(res.xx_teacher_count);
                     $("#cz_teacher_count").html(res.cz_teacher_count);
                     $("#xx_zhuanren_count").html(res.xx_zhuanren_count);
@@ -2246,7 +2246,11 @@
             }
 
             form.on('submit(back)', function () {
-                window.location.href = "/QingLong/view/tb/zbdc/examine/school_list_details.html?flag=2";
+                if (flag == "11") {
+                    window.location.href = "/QingLong/view/tb/zbdc/examine/examine_city_area_list.html?area_id=" + areaId;
+                } else {
+                    window.location.href = "/QingLong/view/tb/zbdc/examine/school_list_details.html?flag=2";
+                }
                 // 阻止表单的默认提交行为
                 return false;
             });
diff --git a/WebRoot/view/tb/zbdc/examine/data_all_xx.html b/WebRoot/view/tb/zbdc/examine/data_all_xx.html
index bab6db2e..a39f1f87 100644
--- a/WebRoot/view/tb/zbdc/examine/data_all_xx.html
+++ b/WebRoot/view/tb/zbdc/examine/data_all_xx.html
@@ -1294,8 +1294,12 @@
                 });
             }
 
-            form.on('submit(back)', function () {
-                window.location.href = "/QingLong/view/tb/zbdc/examine/school_list_details.html?flag=2";
+            form.on('submit(back)', function () {                
+                if (flag == "11") {
+                    window.location.href = "/QingLong/view/tb/zbdc/examine/examine_city_area_list.html?area_id=" + areaId;
+                } else {
+                    window.location.href = "/QingLong/view/tb/zbdc/examine/school_list_details.html?flag=2";
+                }
                 // 阻止表单的默认提交行为
                 return false;
             });
diff --git a/WebRoot/view/tb/zbdc/examine/examine_city.html b/WebRoot/view/tb/zbdc/examine/examine_city.html
index 38946384..687ac250 100644
--- a/WebRoot/view/tb/zbdc/examine/examine_city.html
+++ b/WebRoot/view/tb/zbdc/examine/examine_city.html
@@ -74,11 +74,16 @@
             color: #ffb800 !important;
         }
 
+        .woo-red-color {
+            color: #ff5722 !important;
+        }
+
         .woo-tool-span {
             margin: 0 3px;
             position: relative;
             top: -1px;
             cursor: pointer;
+
         }
 
         .layui-table {
@@ -106,13 +111,20 @@
                         <table class="layui-table" id="myTable"></table>
 
                         <script type="text/html" id="table-bar">
-                        {{#  if(d.pass === 1) { }}                
+                        {{#  if(d.check_type_id === 0) { }}      
+                            <span class="woo-tool-span woo-tool-text-span" style="color: #c2c2c2 !important;cursor:default;">未提交数据，暂无可用操作</span>          
+                            
+                        {{#  } else { }}    
                             <span class="woo-tool-span woo-tool-text-span" lay-event="view"><a
-                                class="woo-theme-color">查看详情</a></span>
+                                class="woo-blue-color">查看详情</a></span>
                                 <i class="woo-tool-text-delimiter"></i>
                             <span class="woo-tool-span woo-tool-text-span" lay-event="shenhe"><a
-                                class="woo-orange-color">审核通过</a></span>               
-                        {{#  } }}    
+                                class="woo-theme-color">审核通过</a></span>
+                                <i class="woo-tool-text-delimiter"></i>
+                            <span class="woo-tool-span woo-tool-text-span" lay-event="tuihui"><a
+                                class="woo-red-color">退回</a></span>
+
+                        {{#  } }} 
                     </script>
                     </div>
                 </div>
@@ -122,17 +134,6 @@
                 <div class="layui-card">
                     <div class="layui-card-body">
 
-                        <div class="layui-form-item layui-inline">
-                            <label class="layui-form-label" style="width: auto;">状态：</label>
-                            <div class="layui-input-inline">
-                                <select id="statusId" lay-filter="status">
-                                    <option value="0">待审核</option>
-                                    <option value="1">已审核</option>
-                                    <option value="-1">未提交</option>
-                                </select>
-                            </div>
-                        </div>
-
                         <div class="layui-form-item layui-inline">
                             <label class="layui-form-label" style="width: auto;">学校类型：</label>
                             <div class="layui-input-inline" id="xxlxView"></div>
@@ -168,13 +169,20 @@
                         <table class="layui-table" id="myTable1" style="margin-top: 10px !important;"></table>
 
                         <script type="text/html" id="table-bar1">
-                        {{#  if(d.pass === 1) { }}                
-                            <span class="woo-tool-span woo-tool-text-span" lay-event="view1"><a
-                                class="woo-theme-color">查看详情</a></span>
+                        {{#  if(d.check_type_id === 0) { }}      
+                            <span class="woo-tool-span woo-tool-text-span" style="color: #c2c2c2 !important;cursor:default;">未提交数据，暂无可用操作</span>          
+                            
+                        {{#  } else { }}    
+                            <span class="woo-tool-span woo-tool-text-span" lay-event="view"><a
+                                class="woo-blue-color">查看详情</a></span>
                                 <i class="woo-tool-text-delimiter"></i>
-                            <span class="woo-tool-span woo-tool-text-span" lay-event="shenhe1"><a
-                                class="woo-orange-color">审核通过</a></span>               
-                        {{#  } }}    
+                            <span class="woo-tool-span woo-tool-text-span" lay-event="shenhe"><a
+                                class="woo-theme-color">审核通过</a></span>
+                                <i class="woo-tool-text-delimiter"></i>
+                            <span class="woo-tool-span woo-tool-text-span" lay-event="tuihui"><a
+                                class="woo-red-color">退回</a></span>
+
+                        {{#  } }} 
                     </script>
                     </div>
                 </div>
@@ -202,10 +210,10 @@
                 height: 'full-85',
                 cols: [[
                     { title: '序号', align: 'center', width: "10%", type: 'numbers' },
-                    { title: '行政区划', field: 'area_name', align: 'center', width: "35%" },
-                    { title: '下级单位', field: 'count', align: 'center', width: "30%" },
-                    { title: '状态', field: 'count', align: 'center', width: "30%" },
-                    { title: '操作', toolbar: '#table-bar', align: 'center', width: "25%" }
+                    { title: '行政区划', field: 'area_name', align: 'center', width: "40%" },
+                    { title: '下级单位', field: 'count', align: 'center', width: "15%" },
+                    { title: '状态', field: 'check_type_name', align: 'center', width: "15%" },
+                    { title: '操作', toolbar: '#table-bar', align: 'center', width: "20%" }
                 ]],
                 // skin: 'line',
                 defaultToolbar: []
@@ -226,52 +234,47 @@
                 }
             });
 
-            table.render({
-                elem: '#myTable1',
-                url: '/QingLong/zbdc/listSchool',
-                where: {
-                    check_type_id: $("#statusId").val(),                    
-                    school_type_id: $("#xxlxId").val(),
-                    keyword: $("#xxmc").val()
-                },
-                cellExpandedMode: "tips",
-                height: 'full-85',
-                cols: [[
-                    { title: '序号', align: 'center', width: "10%", type: 'numbers' },
-                    { title: '学校名称', field: 'area_name', align: 'center', width: "35%" },
-                    { title: '学校类型', field: 'count', align: 'center', width: "30%" },
-                    { title: '状态', field: 'count', align: 'center', width: "30%" },
-                    { title: '操作', toolbar: '#table-bar1', align: 'center', width: "25%" }
-                ]],
-                // skin: 'line',
-                defaultToolbar: []
-            });
-
-            form.on('select(status)', function (data) {
-                if (data.value == 0) {
-                    $("#shenhe").show();
-                } else {
-                    $("#shenhe").hide();
-                }
-                tableRender();
-                // 阻止表单的默认提交行为
-                return false;
-            });
+            tableRender1();
+
+            function tableRender1() {
+
+                table.render({
+                    elem: '#myTable1',
+                    url: '/QingLong/zbdc/listSchool',
+                    where: {
+                        page: 1,
+                        limit: 100,
+                        school_type_id: $("#xxlxId").val(),
+                        keyword: $("#xxmc").val()
+                    },
+                    cellExpandedMode: "tips",
+                    height: 'full-135',
+                    cols: [[
+                        { title: '序号', align: 'center', width: "10%", type: 'numbers' },
+                        { title: '学校名称', field: 'org_name', align: 'center', width: "40%" },
+                        { title: '学校类型', field: 'school_type_name', align: 'center', width: "15%" },
+                        { title: '状态', field: 'check_type_name', align: 'center', width: "15%" },
+                        { title: '操作', toolbar: '#table-bar1', align: 'center', width: "20%" }
+                    ]],
+                    // skin: 'line',
+                    defaultToolbar: []
+                });
+            }
 
             form.on('submit(user-query)', function () {
-
-                tableRender()
-
-                // 阻止表单的默认提交行为
+                tableRender1();
                 return false;
             });
 
             form.on('select(xxlx)', function () {
-                tableRender();
-                // 阻止表单的默认提交行为
+                tableRender1();
                 return false;
             });
 
+            table.on('tool(myTable1)', function (obj) {
+                console.log(obj);
+            });
+
             table.on('tool(myTable)', function (obj) {
                 var areaId = obj.data.id;
                 if (obj.event === 'view') {
diff --git a/WebRoot/view/tb/zbdc/examine/examine_city_area_list.html b/WebRoot/view/tb/zbdc/examine/examine_city_area_list.html
index 3650de63..8a83f2c4 100644
--- a/WebRoot/view/tb/zbdc/examine/examine_city_area_list.html
+++ b/WebRoot/view/tb/zbdc/examine/examine_city_area_list.html
@@ -85,7 +85,7 @@
                 <div class="layui-input-inline">
                     <select id="statusId" lay-filter="status">
                         <option value="0">待审核</option>
-                        <option value="1">已审核</option>                        
+                        <option value="1">已审核</option>
                     </select>
                 </div>
             </div>
@@ -122,7 +122,7 @@
 
             <button class="layui-btn layui-bg-orange layui-btn-sm" lay-submit lay-filter="shenhe" id="shenhe"
                 style="position: absolute;top: 15px;right: 96px;z-index: 999;"><i class="layui-icon layui-icon-ok">
-                </i>一键审核通过</button>
+                </i>审核通过</button>
 
             <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm" lay-submit lay-filter="back"
                 style="position: absolute;top: 15px;right: 15px;z-index: 999;"><i class="layui-icon layui-icon-return">
@@ -188,7 +188,7 @@
                     cols: [[
                         { title: '序号', align: 'center', width: "10%", type: 'numbers' },
                         { title: '学校名称', field: 'org_name', align: 'center', width: "30%" },
-                        { title: '学校类型', field: 'school_type_name', align: 'center', width: "30%" },                        
+                        { title: '学校类型', field: 'school_type_name', align: 'center', width: "30%" },
                         { title: '操作', toolbar: '#table-bar', align: 'center', width: "30%" }
                     ]],
                     // skin: 'line',
@@ -267,7 +267,14 @@
 
             table.on('tool(myTable)', function (obj) {
                 if (obj.event === 'view') {
-                    window.location.href = "/QingLong/view/tb/zbdc/examine/data_all.html?bureau_id=" + obj.data.bureau_id + "&flag=2&area_id=" + areaId;
+                    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=11&area_id=" + areaId;
+                    } 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=11&area_id=" + areaId;
+                    }
+                    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=11&area_id=" + areaId;
+                    }
                 }
             });