diff --git a/safesite/templates/operation.html b/safesite/templates/operation.html index 8fde6411..448ce933 100644 --- a/safesite/templates/operation.html +++ b/safesite/templates/operation.html @@ -166,7 +166,7 @@ } function exportzyexcel() { var querydata = $('#searchzyff').serializeJSON(); - let url = 'api/operation?a=exportexcel'+parseParams(querydata) + let url = 'api/operation?a=exportexcel&'+ parseParams(querydata) window.open(url); } function gbzy(){ diff --git a/safesite/views.py b/safesite/views.py index fd509d48..4409f26f 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -5420,7 +5420,12 @@ def apioperation(req): userid = req.session['userid'] usecomp = User.objects.get(userid=userid).usecomp a = Operation.objects.filter( - usecomp=usecomp, deletemark=1).order_by('-submittime') + usecomp=usecomp, deletemark=1) + if req.GET.get('qssj', None): + a = a.filter(kssj__gte=req.GET.get('qssj')) + if req.GET.get('jssj', None): + a = a.filter(jssj__lte=req.GET.get('jssj')) + a = a.order_by('-submittime') res = exportxlsx('zy', a) return res elif a == 'listtodo':