|
|
@@ -19,11 +19,23 @@ def lensman_list(request, administrator):
|
19
|
19
|
page = request.POST.get('page', 1)
|
20
|
20
|
num = request.POST.get('num', 20)
|
21
|
21
|
query = request.POST.get('query', '')
|
|
22
|
+ lensman_status = request.POST.get('lensman_status', '')
|
|
23
|
+ end_date = tc.to_date(request.POST.get('end_date', ''))
|
|
24
|
+ integral_end_date = tc.to_date(request.POST.get('integral_end_date', ''))
|
22
|
25
|
|
23
|
26
|
logs = LensmanInfo.objects.filter(status=True).order_by('-pk')
|
24
|
27
|
|
25
|
28
|
if query:
|
26
|
29
|
logs = logs.filter(Q(name__icontains=query) | Q(phone__icontains=query))
|
|
30
|
+
|
|
31
|
+ if lensman_status:
|
|
32
|
+ logs = logs.filter(lensman_status=lensman_status)
|
|
33
|
+
|
|
34
|
+ if end_date:
|
|
35
|
+ logs = logs.filter(end_date__lte=end_date)
|
|
36
|
+
|
|
37
|
+ if integral_end_date:
|
|
38
|
+ logs = logs.filter(integral_end_date__lte=integral_end_date)
|
27
|
39
|
|
28
|
40
|
count = logs.count()
|
29
|
41
|
logs, left = pagination(logs, page, num)
|