From 1bd6748a215efcf668a0d38b8b14e7eae7bbc0ab Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Tue, 27 Oct 2020 21:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=89=80=E6=9C=89=E9=A2=98?=
 =?UTF-8?q?=E7=9B=AE=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/question.html       |  7 +++++--
 safesite/templates/questionchoose.html | 10 +++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/safesite/templates/question.html b/safesite/templates/question.html
index 9682e952..bfe3376a 100644
--- a/safesite/templates/question.html
+++ b/safesite/templates/question.html
@@ -62,9 +62,10 @@
                     <option value="3">判断</option>
                 </select>
                 <input class="easyui-textbox" style="width:300px" name="title" data-options="prompt:'题干/分类名'"></input>
-            
+                {% if request|has_permission:'b_question_showall' %}
                 <label>显示全部</label>
                 <input type="checkbox" id="showAll" name="all" value="1">
+                {% endif %}
                 <a onclick="searchTm()" class="easyui-linkbutton" data-options="iconCls:'fa-search',plain:true">查询</a>
                 <a onclick="reset()" class="easyui-linkbutton"
                data-options="iconCls:'fa-undo',plain:true">重置</a>
@@ -361,7 +362,9 @@
     }
     function reset() {
         $('#searchtmff').form('clear')
-        $('#tmtable').datagrid('reload', {'tmlx':''})
+        var querydata = $('#searchtmff').serializeJSON();
+        querydata['tmlx'] = ''
+        $('#tmtable').datagrid('reload', querydata);
     }
     document.getElementById('drfile').onchange = function () {
         var fileObj = this.files[0];
diff --git a/safesite/templates/questionchoose.html b/safesite/templates/questionchoose.html
index c5160153..2e690d54 100644
--- a/safesite/templates/questionchoose.html
+++ b/safesite/templates/questionchoose.html
@@ -19,10 +19,14 @@
                         <option value="3">判断</option>
                     </select>
                     <input class="easyui-textbox" style="width:300px" name="title" data-options="prompt:'题干/分类名'"></input>
-                
+                    {% load myfilter %}
+                    {% if request|has_permission:'b_question_showall' %}
                     <label>显示全部</label>
                     <input type="checkbox" id="showAll" name="all" value="1">
+                    {% endif %}
                     <a onclick="searchTm()" class="easyui-linkbutton" data-options="iconCls:'fa-search',plain:true">查询</a>
+                    <a onclick="reset()" class="easyui-linkbutton"
+               data-options="iconCls:'fa-undo',plain:true">重置</a>
                 </form>
             </div>
             <table id="tmtable" style="height:100%;"></table>
@@ -56,6 +60,10 @@
             });
         }
     });
+    function reset() {
+        $('#searchtmff').form('clear')
+        $('#tmtable').datagrid('reload', {'tmlx':''})
+    }
     $('#zjfltree').tree({
         url: 'api/questioncat?a=tree2',
         animate: true,