不包含撤销案件 放在案件状态里

src/main/webapp/macx.jsp

@@ -184,15 +184,7 @@
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <!--侦查终结业务数据状态,00呈请,01待审批,02审批通过,03审批未通过,04待撤销,05已撤销,06撤销未通过,07已上报,08上报失败-->
-                                                        <td class="td_title">是否包含撤销案件：</td>
-                                                        <td colspan="5">
-                                                            <input type="radio" class="radio-inline" name="sfbhcxaj" value="05" title="是">是
-                                                            <input type="radio" class="radio-inline" name="sfbhcxaj" value="00" title="否">否
-                                                            <input type="radio" class="radio-inline" name="sfbhcxaj" value="" title="不限" checked="checked">不限
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
+                                                        <td class="td_title">案件状态：</td>
                                                         <!--侦查终结业务数据状态,00呈请,01待审批,02审批通过,03审批未通过,04待撤销,05已撤销,06撤销未通过,07已上报,08上报失败-->
                                                         <td class="td_title" style="text-align: left">
                                                             <input type="checkbox" showType="checkbox" name="laywsjzt01" id="laywsjzt01" value="01"><label for="laywsjzt01">等待立案审批</label>
@@ -204,6 +196,14 @@
                                                             <input type="checkbox" showType="checkbox" name="laywsjzt07" id="laywsjzt07" value="07"><label for="laywsjzt07">立案已上报</label>
                                                         </td>
                                                         <td class="td_title" style="text-align: left">
+                                                            <input type="checkbox" showType="checkbox" name="Sfbhcxaj" id="sfbhcxaj" value="00"><label for="Sfbhcxaj">不包含已撤销案件</label>
+                                                        </td>
+
+                                                        <td class="td_title"></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="td_title"></td>
+                                                        <td class="td_title" style="text-align: left">
                                                             <input type="checkbox" showType="checkbox" name="zczjywsjzt01" id="zczjywsjzt01" value="01"><label for="zczjywsjzt01">等待侦查终结审批</label>
                                                         </td>
                                                         <td class="td_title" style="text-align: left">
@@ -215,7 +215,9 @@
                                                         <td class="td_title" style="text-align: left">
                                                             <input type="checkbox" showType="checkbox" name="zczjywsjzt00" id="zczjywsjzt00" value="00"><label for="zczjywsjzt00">等待侦查终结采集</label>
                                                         </td>
+                                                        <td class="td_title"></td>
                                                     </tr>
+
                                                     <%-- <tr>
                                                          <!--侦查终结业务数据状态,00呈请,01待审批,02审批通过,03审批未通过,04待撤销,05已撤销,06撤销未通过,07已上报,08上报失败-->
                                                          <td class="td_title">业务状态：</td>
@@ -884,8 +886,7 @@
                                                                           class="radio-inline"
                                                                           name="asjPresentType"
                                                                           value="EZUIGrid"></li>
-                                            <li class="pull-right">
-                                                <input type="checkbox" showtype="minCheck"
+                                            <li class="pull-right"><input type="checkbox" showtype="minCheck"
                                                                           onclick="navCategoryFormUtils.checkAllNav(this)"
                                                                           id="asjSearchConfigCheckAll"><label
                                                     for="asjSearchConfigCheckAll">全选</label></li>