|
|
@@ -124,6 +124,7 @@ def shot_request_list(request, administrator):
|
124
|
124
|
page = request.POST.get('page', 1)
|
125
|
125
|
num = request.POST.get('num', 20)
|
126
|
126
|
query = request.POST.get('query', '')
|
|
127
|
+ model_id = request.POST.get('model_id', '')
|
127
|
128
|
start_time = request.POST.get('start_time', '')
|
128
|
129
|
end_time = request.POST.get('end_time', '')
|
129
|
130
|
request_status = request.POST.get('request_status', 'all')
|
|
|
@@ -134,6 +135,9 @@ def shot_request_list(request, administrator):
|
134
|
135
|
shots = list(TenancyShotInfo.objects.values_list('shot_id', flat=True).filter(sn__icontains=query))
|
135
|
136
|
reqs = reqs.filter(Q(phone__icontains=query) | Q(name__icontains=query) | Q(shot_id__in=shots))
|
136
|
137
|
|
|
138
|
+ if model_id:
|
|
139
|
+ reqs = reqs.filter(model_id=model_id)
|
|
140
|
+
|
137
|
141
|
if request_status != 'all':
|
138
|
142
|
reqs = reqs.filter(request_status=request_status)
|
139
|
143
|
|